Continue propagating the GoogleTest flags until we can update our version to

eliminate this problem. This will hopefully let us make progress on Linux
bootstrapping.

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

diff --git a/utils/unittest/UnitTestMain/Makefile b/utils/unittest/UnitTestMain/Makefile
index 328d5e2917fb048a052754a52245db917270603b..5c1004942db8dc4c6c19506d532920c841227baa 100644 (file)
--- a/utils/unittest/UnitTestMain/Makefile
+++ b/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/utils/unittest/googletest/Makefile b/utils/unittest/googletest/Makefile
index 688a5bda812bebfa205cc4f7d219940ec068ff7d..1ec979d961e8001da48477ee142ffba1447f8222 100644 (file)
--- a/utils/unittest/googletest/Makefile
+++ b/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