diff options
| author | Tanya Lattner <tonic@nondot.org> | 2010-03-30 23:03:45 +0000 |
|---|---|---|
| committer | Tanya Lattner <tonic@nondot.org> | 2010-03-30 23:03:45 +0000 |
| commit | b76aad9fc0854bebacf53000130e20aaa7a76731 (patch) | |
| tree | 28f7eaa23d2040d248c4e73e0f5129caeb353e26 | |
| parent | e9e7d08fc6e2a8bd6b3d9360d24dbcfd90eacce5 (diff) | |
| download | llvm-b76aad9fc0854bebacf53000130e20aaa7a76731.tar.gz | |
Merge 98095 from mainline. Fix for PR5893.
llvm-svn: 99958
| -rw-r--r-- | llvm/utils/unittest/UnitTestMain/Makefile | 6 | ||||
| -rw-r--r-- | llvm/utils/unittest/googletest/Makefile | 3 |
2 files changed, 8 insertions, 1 deletions
diff --git a/llvm/utils/unittest/UnitTestMain/Makefile b/llvm/utils/unittest/UnitTestMain/Makefile index 328d5e2917fb..5c1004942db8 100644 --- a/llvm/utils/unittest/UnitTestMain/Makefile +++ b/llvm/utils/unittest/UnitTestMain/Makefile @@ -14,7 +14,13 @@ include $(LEVEL)/Makefile.config LIBRARYNAME = UnitTestMain BUILD_ARCHIVE = 1 REQUIRES_RTTI = 1 + CPP.Flags += -I$(LLVM_SRC_ROOT)/utils/unittest/googletest/include CPP.Flags += $(NO_MISSING_FIELD_INITIALIZERS) $(NO_VARIADIC_MACROS) +CPP.Flags += -DGTEST_HAS_RTTI=0 +# libstdc++'s TR1 <tuple> header depends on RTTI and uses C++'0x features not +# supported by Clang, so force googletest to use its own tuple implementation. +# When we import googletest >=1.4.0, we can drop this line. +CPP.Flags += -DGTEST_HAS_TR1_TUPLE=0 include $(LEVEL)/Makefile.common diff --git a/llvm/utils/unittest/googletest/Makefile b/llvm/utils/unittest/googletest/Makefile index 688a5bda812b..1ec979d961e8 100644 --- a/llvm/utils/unittest/googletest/Makefile +++ b/llvm/utils/unittest/googletest/Makefile @@ -16,7 +16,8 @@ BUILD_ARCHIVE = 1 REQUIRES_RTTI = 1 # Note that these flags are duplicated when building individual tests in -# unittests/Makefile.unittest; ensure that any changes are made to both. +# unittests/Makefile.unittest and ../UnitTestMain/Makefile; ensure that any +# changes are made to both. CPP.Flags += -I$(LLVM_SRC_ROOT)/utils/unittest/googletest/include CPP.Flags += $(NO_MISSING_FIELD_INITIALIZERS) $(NO_VARIADIC_MACROS) CPP.Flags += -DGTEST_HAS_RTTI=0 |