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.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@146706 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/utils/llvm-build/llvmbuild/main.py b/utils/llvm-build/llvmbuild/main.py
index 2d7db04..36bca87 100644
--- a/utils/llvm-build/llvmbuild/main.py
+++ b/utils/llvm-build/llvmbuild/main.py
@@ -329,7 +329,7 @@
# 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 @@
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