llvm.org GIT mirror llvm / bb53bbb
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 Daniel Dunbar 8 years ago
4 changed file(s) with 5 addition(s) and 7 deletion(s). Raw diff Collapse all Expand all
3333 CPP.Flags += -DGTEST_HAS_PTHREAD=0
3434 endif
3535
36 TESTLIBS = -lGoogleTest -lUnitTestMain
36 TESTLIBS = -lgtest -lgtest_main
3737
3838 ifeq ($(ENABLE_SHARED), 1)
3939 ifneq (,$(RPATH))
328328
329329 # Get the library name, or None for LibraryGroups.
330330 if c.type_name == 'Library':
331 library_name = c.get_library_name()
331 library_name = c.get_prefixed_library_name()
332332 else:
333333 library_name = None
334334
390390 if library_name is None:
391391 library_name_as_cstr = '0'
392392 else:
393 # If we had a project level component, we could derive the
394 # library prefix.
395 library_name_as_cstr = '"libLLVM%s.a"' % library_name
393 library_name_as_cstr = '"lib%s.a"' % library_name
396394 print >>f, ' { "%s", %s, { %s } },' % (
397395 name, library_name_as_cstr,
398396 ', '.join('"%s"' % dep
1010
1111 include $(LEVEL)/Makefile.config
1212
13 LIBRARYNAME = UnitTestMain
13 LIBRARYNAME = gtest_main
1414 BUILD_ARCHIVE = 1
1515 REQUIRES_RTTI = 1
1616
1010
1111 include $(LEVEL)/Makefile.config
1212
13 LIBRARYNAME = GoogleTest
13 LIBRARYNAME = gtest
1414 BUILD_ARCHIVE = 1
1515 REQUIRES_RTTI = 1
1616