llvm.org GIT mirror llvm / dd99d9b
Merge 98074 from mainline. Fix for PR5893. git-svn-id: https://llvm.org/svn/llvm-project/llvm/branches/release_27@99956 91177308-0d34-0410-b5e6-96231b3b80d8 Tanya Lattner 10 years ago
2 changed file(s) with 19 addition(s) and 8 deletion(s). Raw diff Collapse all Expand all
1313 # Set up variables for building a unit test.
1414 ifdef TESTNAME
1515
16 CPP.Flags += -DGTEST_HAS_RTTI=0
17 # gcc's TR1 header depends on RTTI, so force googletest to use
18 # its own tuple implementation. When we import googletest >=1.4.0, we
19 # can drop this line.
20 CPP.Flags += -DGTEST_HAS_TR1_TUPLE=0
21
2216 include $(LEVEL)/Makefile.common
2317
2418 LLVMUnitTestExe = $(BuildMode)/$(TESTNAME)Tests$(EXEEXT)
2519
26 CPP.Flags += -I$(LLVM_SRC_ROOT)/utils/unittest/googletest/include/
27 CPP.Flags += $(NO_VARIADIC_MACROS)
20 # Note that these flags are duplicated when building GoogleTest itself in
21 # utils/unittest/googletest/Makefile; ensure that any changes are made to both.
22 CPP.Flags += -I$(LLVM_SRC_ROOT)/utils/unittest/googletest/include
23 CPP.Flags += $(NO_MISSING_FIELD_INITIALIZERS) $(NO_VARIADIC_MACROS)
24 CPP.Flags += -DGTEST_HAS_RTTI=0
25 # libstdc++'s TR1 header depends on RTTI and uses C++'0x features not
26 # supported by Clang, so force googletest to use its own tuple implementation.
27 # When we import googletest >=1.4.0, we can drop this line.
28 CPP.Flags += -DGTEST_HAS_TR1_TUPLE=0
29
2830 TESTLIBS = -lGoogleTest -lUnitTestMain
2931
3032 ifeq ($(ENABLE_SHARED), 1)
1313 LIBRARYNAME = GoogleTest
1414 BUILD_ARCHIVE = 1
1515 REQUIRES_RTTI = 1
16
17 # Note that these flags are duplicated when building individual tests in
18 # unittests/Makefile.unittest; ensure that any changes are made to both.
1619 CPP.Flags += -I$(LLVM_SRC_ROOT)/utils/unittest/googletest/include
1720 CPP.Flags += $(NO_MISSING_FIELD_INITIALIZERS) $(NO_VARIADIC_MACROS)
21 CPP.Flags += -DGTEST_HAS_RTTI=0
22 # libstdc++'s TR1 header depends on RTTI and uses C++'0x features not
23 # supported by Clang, so force googletest to use its own tuple implementation.
24 # When we import googletest >=1.4.0, we can drop this line.
25 CPP.Flags += -DGTEST_HAS_TR1_TUPLE=0
26
1827
1928 ifeq ($(HOST_OS),MingW)
2029 CPP.Flags += -DGTEST_OS_WINDOWS=1