[llvm-commits] [llvm] r98095 - in /llvm/trunk/utils/unittest: UnitTestMain/Makefile googletest/Makefile

[Chandler Carruth]

Author: chandlerc
Date: Tue Mar  9 16:45:10 2010
New Revision: 98095

URL: http://llvm.org/viewvc/llvm-project?rev=98095&view=rev
Log:
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.

Modified:
    llvm/trunk/utils/unittest/UnitTestMain/Makefile
    llvm/trunk/utils/unittest/googletest/Makefile

Modified: llvm/trunk/utils/unittest/UnitTestMain/Makefile
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/unittest/UnitTestMain/Makefile?rev=98095&r1=98094&r2=98095&view=diff
==============================================================================
--- llvm/trunk/utils/unittest/UnitTestMain/Makefile (original)
+++ llvm/trunk/utils/unittest/UnitTestMain/Makefile Tue Mar  9 16:45:10 2010
@@ -14,7 +14,13 @@
 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

Modified: llvm/trunk/utils/unittest/googletest/Makefile
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/unittest/googletest/Makefile?rev=98095&r1=98094&r2=98095&view=diff
==============================================================================
--- llvm/trunk/utils/unittest/googletest/Makefile (original)
+++ llvm/trunk/utils/unittest/googletest/Makefile Tue Mar  9 16:45:10 2010
@@ -16,7 +16,8 @@
 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