llvm.org GIT mirror llvm / 3be1985
Merge 98095 from mainline. Fix for PR5893. git-svn-id: https://llvm.org/svn/llvm-project/llvm/branches/release_27@99958 91177308-0d34-0410-b5e6-96231b3b80d8 Tanya Lattner 10 years ago
2 changed file(s) with 8 addition(s) and 1 deletion(s). Raw diff Collapse all Expand all
1313 LIBRARYNAME = UnitTestMain
1414 BUILD_ARCHIVE = 1
1515 REQUIRES_RTTI = 1
16
1617 CPP.Flags += -I$(LLVM_SRC_ROOT)/utils/unittest/googletest/include
1718 CPP.Flags += $(NO_MISSING_FIELD_INITIALIZERS) $(NO_VARIADIC_MACROS)
19 CPP.Flags += -DGTEST_HAS_RTTI=0
20 # libstdc++'s TR1 header depends on RTTI and uses C++'0x features not
21 # supported by Clang, so force googletest to use its own tuple implementation.
22 # When we import googletest >=1.4.0, we can drop this line.
23 CPP.Flags += -DGTEST_HAS_TR1_TUPLE=0
1824
1925 include $(LEVEL)/Makefile.common
1515 REQUIRES_RTTI = 1
1616
1717 # Note that these flags are duplicated when building individual tests in
18 # unittests/Makefile.unittest; ensure that any changes are made to both.
18 # unittests/Makefile.unittest and ../UnitTestMain/Makefile; ensure that any
19 # changes are made to both.
1920 CPP.Flags += -I$(LLVM_SRC_ROOT)/utils/unittest/googletest/include
2021 CPP.Flags += $(NO_MISSING_FIELD_INITIALIZERS) $(NO_VARIADIC_MACROS)
2122 CPP.Flags += -DGTEST_HAS_RTTI=0