build/unittests: Fix llvm-config names for gtest libraries, and bring Makefile

library names in line with those used by CMake.
 - Patch by Johannes Obermayr, with tweaks by me.

llvm-svn: 146706

1 files changed, 2 insertions, 4 deletions

diff --git a/llvm/utils/llvm-build/llvmbuild/main.py b/llvm/utils/llvm-build/llvmbuild/main.py
index 2d7db046212..36bca872e5f 100644
--- a/llvm/utils/llvm-build/llvmbuild/main.py
+++ b/llvm/utils/llvm-build/llvmbuild/main.py
@@ -329,7 +329,7 @@ subdirectories = %s
             
             # Get the library name, or None for LibraryGroups.
             if c.type_name == 'Library':
-                library_name = c.get_library_name()
+                library_name = c.get_prefixed_library_name()
             else:
                 library_name = None
 
@@ -391,9 +391,7 @@ subdirectories = %s
             if library_name is None:
                 library_name_as_cstr = '0'
             else:
-                # If we had a project level component, we could derive the
-                # library prefix.
-                library_name_as_cstr = '"libLLVM%s.a"' % library_name
+                library_name_as_cstr = '"lib%s.a"' % library_name
             print >>f, '  { "%s", %s, { %s } },' % (
                 name, library_name_as_cstr,
                 ', '.join('"%s"' % dep