diff options
| author | Daniel Dunbar <daniel@zuster.org> | 2011-12-15 23:35:08 +0000 |
|---|---|---|
| committer | Daniel Dunbar <daniel@zuster.org> | 2011-12-15 23:35:08 +0000 |
| commit | bb53bbb7d4b1ac3da416d922101d4cbc280b145c (patch) | |
| tree | d0c7fb837d32d11178cdad70695820c27683729d | |
| parent | 028700f544deeea423ce9b516e190e4e970e3c6c (diff) | |
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
| -rw-r--r-- | unittests/Makefile.unittest | 2 | ||||
| -rw-r--r-- | utils/llvm-build/llvmbuild/main.py | 6 | ||||
| -rw-r--r-- | utils/unittest/UnitTestMain/Makefile | 2 | ||||
| -rw-r--r-- | utils/unittest/googletest/Makefile | 2 |
4 files changed, 5 insertions, 7 deletions
diff --git a/unittests/Makefile.unittest b/unittests/Makefile.unittest index 580ad7d7191..bd32aed4b0a 100644 --- a/unittests/Makefile.unittest +++ b/unittests/Makefile.unittest @@ -34,7 +34,7 @@ ifneq ($(HAVE_PTHREAD), 1) CPP.Flags += -DGTEST_HAS_PTHREAD=0 endif -TESTLIBS = -lGoogleTest -lUnitTestMain +TESTLIBS = -lgtest -lgtest_main ifeq ($(ENABLE_SHARED), 1) ifneq (,$(RPATH)) diff --git a/utils/llvm-build/llvmbuild/main.py b/utils/llvm-build/llvmbuild/main.py index 2d7db046212..36bca872e5f 100644 --- a/utils/llvm-build/llvmbuild/main.py +++ b/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 diff --git a/utils/unittest/UnitTestMain/Makefile b/utils/unittest/UnitTestMain/Makefile index 30827795aff..7bcb7249504 100644 --- a/utils/unittest/UnitTestMain/Makefile +++ b/utils/unittest/UnitTestMain/Makefile @@ -11,7 +11,7 @@ LEVEL = ../../.. include $(LEVEL)/Makefile.config -LIBRARYNAME = UnitTestMain +LIBRARYNAME = gtest_main BUILD_ARCHIVE = 1 REQUIRES_RTTI = 1 diff --git a/utils/unittest/googletest/Makefile b/utils/unittest/googletest/Makefile index 21b29ffc2c3..22c8f36fccb 100644 --- a/utils/unittest/googletest/Makefile +++ b/utils/unittest/googletest/Makefile @@ -11,7 +11,7 @@ LEVEL := ../../.. include $(LEVEL)/Makefile.config -LIBRARYNAME = GoogleTest +LIBRARYNAME = gtest BUILD_ARCHIVE = 1 REQUIRES_RTTI = 1 |