[llvm-branch-commits] [llvm-branch] r99956 - in /llvm/branches/release_27: unittests/Makefile.unittest utils/unittest/googletest/Makefile

[Tanya Lattner]

Author: tbrethou
Date: Tue Mar 30 18:03:09 2010
New Revision: 99956

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

Modified:
    llvm/branches/release_27/unittests/Makefile.unittest
    llvm/branches/release_27/utils/unittest/googletest/Makefile

Modified: llvm/branches/release_27/unittests/Makefile.unittest
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_27/unittests/Makefile.unittest?rev=99956&r1=99955&r2=99956&view=diff
==============================================================================
--- llvm/branches/release_27/unittests/Makefile.unittest (original)
+++ llvm/branches/release_27/unittests/Makefile.unittest Tue Mar 30 18:03:09 2010
@@ -14,18 +14,20 @@
 # Set up variables for building a unit test.
 ifdef TESTNAME
 
-CPP.Flags += -DGTEST_HAS_RTTI=0
-# gcc's TR1 <tuple> header depends on RTTI, 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
 
 LLVMUnitTestExe = $(BuildMode)/$(TESTNAME)Tests$(EXEEXT)
 
-CPP.Flags += -I$(LLVM_SRC_ROOT)/utils/unittest/googletest/include/
-CPP.Flags += $(NO_VARIADIC_MACROS)
+# Note that these flags are duplicated when building GoogleTest itself in
+# utils/unittest/googletest/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
+# 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
+
 TESTLIBS = -lGoogleTest -lUnitTestMain
 
 ifeq ($(ENABLE_SHARED), 1)

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=99956&r1=99955&r2=99956&view=diff
==============================================================================
--- llvm/branches/release_27/utils/unittest/googletest/Makefile (original)
+++ llvm/branches/release_27/utils/unittest/googletest/Makefile Tue Mar 30 18:03:09 2010
@@ -14,8 +14,17 @@
 LIBRARYNAME = GoogleTest
 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.
 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
+
 
 ifeq ($(HOST_OS),MingW)
   CPP.Flags += -DGTEST_OS_WINDOWS=1