[llvm-branch-commits] [llvm-branch] r99958 - in /llvm/branches/release_27/utils/unittest: UnitTestMain/Makefile googletest/Makefile

Tanya Lattner tonic at nondot.org
Tue Mar 30 16:03:45 PDT 2010


Author: tbrethou
Date: Tue Mar 30 18:03:45 2010
New Revision: 99958

URL: http://llvm.org/viewvc/llvm-project?rev=99958&view=rev
Log:
Merge 98095 from mainline. Fix for PR5893.

Modified:
    llvm/branches/release_27/utils/unittest/UnitTestMain/Makefile
    llvm/branches/release_27/utils/unittest/googletest/Makefile

Modified: llvm/branches/release_27/utils/unittest/UnitTestMain/Makefile
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_27/utils/unittest/UnitTestMain/Makefile?rev=99958&r1=99957&r2=99958&view=diff
==============================================================================
--- llvm/branches/release_27/utils/unittest/UnitTestMain/Makefile (original)
+++ llvm/branches/release_27/utils/unittest/UnitTestMain/Makefile Tue Mar 30 18:03:45 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/branches/release_27/utils/unittest/googletest/Makefile
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_27/utils/unittest/googletest/Makefile?rev=99958&r1=99957&r2=99958&view=diff
==============================================================================
--- llvm/branches/release_27/utils/unittest/googletest/Makefile (original)
+++ llvm/branches/release_27/utils/unittest/googletest/Makefile Tue Mar 30 18:03:45 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





More information about the llvm-branch-commits mailing list