Turns out gtest still prefers the system <tr1/tuple> over it's own

implementation. Force the internal one to unbreak clang selfhost on linux.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@105386 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/unittests/Makefile.unittest b/unittests/Makefile.unittest
index 3bed567503dbadf249ad8488e7de9cef1fb30f54..6001c436e5ae91c2a8e2a1ff7f6054c41326987c 100644 (file)
--- a/unittests/Makefile.unittest
+++ b/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/utils/unittest/UnitTestMain/Makefile b/utils/unittest/UnitTestMain/Makefile
index 16ac38b5688abc87711f67fbc9a05e44a51cd67b..202ccb8eeedc9f2c36fab1d95e8f1fb8c154b6fa 100644 (file)
--- a/utils/unittest/UnitTestMain/Makefile
+++ b/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/utils/unittest/googletest/Makefile b/utils/unittest/googletest/Makefile
index b6e3e68a330358a63879aab682be5a58ba060ebf..bfd35a4f510037e6fa8061a7a82a59e6ba369dff 100644 (file)
--- a/utils/unittest/googletest/Makefile
+++ b/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