Consolidate GoogleTest make options and duplicate them to its own makefile.

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

diff --git a/unittests/Makefile.unittest b/unittests/Makefile.unittest
index b1c1d2c6b14098bfcb98a53d6aacbe94e63ee586..8fbcfd2fb157a5e797a087f516098d56380d2fea 100644 (file)
--- a/unittests/Makefile.unittest
+++ b/unittests/Makefile.unittest
@@ -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)

diff --git a/utils/unittest/googletest/Makefile b/utils/unittest/googletest/Makefile
index 15bbf4e69eaa9493cef772323f15ad8ae039fed2..688a5bda812bebfa205cc4f7d219940ec068ff7d 100644 (file)
--- a/utils/unittest/googletest/Makefile
+++ b/utils/unittest/googletest/Makefile
@@ -14,8 +14,17 @@ include $(LEVEL)/Makefile.config
 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