6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2024-12-13 20:32:21 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
Daniel Dunbar 2011-12-15 23:35:08 +00:00
parent 028700f544
commit bb53bbb7d4
4 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
unittests/Makefile.unittest
View File

@ -34,7 +34,7 @@ ifneq ($(HAVE_PTHREAD), 1)
CPP.Flags += -DGTEST_HAS_PTHREAD=0 CPP.Flags += -DGTEST_HAS_PTHREAD=0
endif endif
TESTLIBS = -lGoogleTest -lUnitTestMain TESTLIBS = -lgtest -lgtest_main
ifeq ($(ENABLE_SHARED), 1) ifeq ($(ENABLE_SHARED), 1)
ifneq (,$(RPATH)) ifneq (,$(RPATH))

6
utils/llvm-build/llvmbuild/main.py
View File

@ -329,7 +329,7 @@ subdirectories = %s
# Get the library name, or None for LibraryGroups. # Get the library name, or None for LibraryGroups.
if c.type_name == 'Library': if c.type_name == 'Library':
library_name = c.get_library_name() library_name = c.get_prefixed_library_name()
else: else:
library_name = None library_name = None
@ -391,9 +391,7 @@ subdirectories = %s
if library_name is None: if library_name is None:
library_name_as_cstr = '0' library_name_as_cstr = '0'
else: else:
# If we had a project level component, we could derive the library_name_as_cstr = '"lib%s.a"' % library_name
# library prefix.
library_name_as_cstr = '"libLLVM%s.a"' % library_name
print >>f, ' { "%s", %s, { %s } },' % ( print >>f, ' { "%s", %s, { %s } },' % (
name, library_name_as_cstr, name, library_name_as_cstr,
', '.join('"%s"' % dep ', '.join('"%s"' % dep

2
utils/unittest/UnitTestMain/Makefile
View File

@ -11,7 +11,7 @@ LEVEL = ../../..
include $(LEVEL)/Makefile.config include $(LEVEL)/Makefile.config
LIBRARYNAME = UnitTestMain LIBRARYNAME = gtest_main
BUILD_ARCHIVE = 1 BUILD_ARCHIVE = 1
REQUIRES_RTTI = 1 REQUIRES_RTTI = 1

2
utils/unittest/googletest/Makefile
View File

@ -11,7 +11,7 @@ LEVEL := ../../..
include $(LEVEL)/Makefile.config include $(LEVEL)/Makefile.config
LIBRARYNAME = GoogleTest LIBRARYNAME = gtest
BUILD_ARCHIVE = 1 BUILD_ARCHIVE = 1
REQUIRES_RTTI = 1 REQUIRES_RTTI = 1