diff options
| author | Benjamin Kramer <benny.kra@googlemail.com> | 2010-06-03 07:51:58 +0000 |
|---|---|---|
| committer | Benjamin Kramer <benny.kra@googlemail.com> | 2010-06-03 07:51:58 +0000 |
| commit | 1add5f378dde00808233c98c82d50e3ca92c5559 (patch) | |
| tree | 67366b6a80331c5536705424b74335bc26ddf765 | |
| parent | d47ff2289396463279c8caddf7fd7729ec366fb7 (diff) | |
| download | bcm5719-llvm-1add5f378dde00808233c98c82d50e3ca92c5559.tar.gz bcm5719-llvm-1add5f378dde00808233c98c82d50e3ca92c5559.zip | |
Turns out gtest still prefers the system <tr1/tuple> over it's own
implementation. Force the internal one to unbreak clang selfhost on linux.
llvm-svn: 105386
| -rw-r--r-- | llvm/unittests/Makefile.unittest | 3 | ||||
| -rw-r--r-- | llvm/utils/unittest/UnitTestMain/Makefile | 3 | ||||
| -rw-r--r-- | llvm/utils/unittest/googletest/Makefile | 3 |
3 files changed, 9 insertions, 0 deletions
diff --git a/llvm/unittests/Makefile.unittest b/llvm/unittests/Makefile.unittest index 3bed567503d..6001c436e5a 100644 --- a/llvm/unittests/Makefile.unittest +++ b/llvm/unittests/Makefile.unittest @@ -23,6 +23,9 @@ LLVMUnitTestExe = $(BuildMode)/$(TESTNAME)Tests$(EXEEXT) 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. +CPP.Flags += -DGTEST_USE_OWN_TR1_TUPLE TESTLIBS = -lGoogleTest -lUnitTestMain diff --git a/llvm/utils/unittest/UnitTestMain/Makefile b/llvm/utils/unittest/UnitTestMain/Makefile index 16ac38b5688..202ccb8eeed 100644 --- a/llvm/utils/unittest/UnitTestMain/Makefile +++ b/llvm/utils/unittest/UnitTestMain/Makefile @@ -18,5 +18,8 @@ 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. +CPP.Flags += -DGTEST_USE_OWN_TR1_TUPLE include $(LEVEL)/Makefile.common diff --git a/llvm/utils/unittest/googletest/Makefile b/llvm/utils/unittest/googletest/Makefile index b6e3e68a330..bfd35a4f510 100644 --- a/llvm/utils/unittest/googletest/Makefile +++ b/llvm/utils/unittest/googletest/Makefile @@ -21,6 +21,9 @@ 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. +CPP.Flags += -DGTEST_USE_OWN_TR1_TUPLE ifeq ($(HOST_OS),MingW) CPP.Flags += -DGTEST_OS_WINDOWS=1 |
