[llvm-commits] [llvm] r105386 - in /llvm/trunk: unittests/Makefile.unittest utils/unittest/UnitTestMain/Makefile utils/unittest/googletest/Makefile

[Benjamin Kramer]

Author: d0k
Date: Thu Jun  3 02:51:58 2010
New Revision: 105386

URL: http://llvm.org/viewvc/llvm-project?rev=105386&view=rev
Log:
Turns out gtest still prefers the system <tr1/tuple> over it's own
implementation. Force the internal one to unbreak clang selfhost on linux.

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

Modified: llvm/trunk/unittests/Makefile.unittest
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/unittests/Makefile.unittest?rev=105386&r1=105385&r2=105386&view=diff
==============================================================================
--- llvm/trunk/unittests/Makefile.unittest (original)
+++ llvm/trunk/unittests/Makefile.unittest Thu Jun  3 02:51:58 2010
@@ -23,6 +23,9 @@
 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
 

Modified: llvm/trunk/utils/unittest/UnitTestMain/Makefile
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/unittest/UnitTestMain/Makefile?rev=105386&r1=105385&r2=105386&view=diff
==============================================================================
--- llvm/trunk/utils/unittest/UnitTestMain/Makefile (original)
+++ llvm/trunk/utils/unittest/UnitTestMain/Makefile Thu Jun  3 02:51:58 2010
@@ -18,5 +18,8 @@
 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

Modified: llvm/trunk/utils/unittest/googletest/Makefile
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/unittest/googletest/Makefile?rev=105386&r1=105385&r2=105386&view=diff
==============================================================================
--- llvm/trunk/utils/unittest/googletest/Makefile (original)
+++ llvm/trunk/utils/unittest/googletest/Makefile Thu Jun  3 02:51:58 2010
@@ -21,6 +21,9 @@
 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