aboutsummaryrefslogtreecommitdiffstats
path: root/unittests/Makefile.unittest
diff options
context:
space:
mode:
authorChandler Carruth <chandlerc@gmail.com>2010-03-09 19:24:49 +0000
committerChandler Carruth <chandlerc@gmail.com>2010-03-09 19:24:49 +0000
commitf10e43ee7e3cb171e44c201e133fa153778d0da4 (patch)
tree5a7798a3a12edaaca53f5bcc42c2e6ca730312c7 /unittests/Makefile.unittest
parent4e501545cd12d903d35096f42eb5fdbe4603d5da (diff)
downloadexternal_llvm-f10e43ee7e3cb171e44c201e133fa153778d0da4.zip
external_llvm-f10e43ee7e3cb171e44c201e133fa153778d0da4.tar.gz
external_llvm-f10e43ee7e3cb171e44c201e133fa153778d0da4.tar.bz2
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
Diffstat (limited to 'unittests/Makefile.unittest')
-rw-r--r--unittests/Makefile.unittest18
1 files changed, 10 insertions, 8 deletions
diff --git a/unittests/Makefile.unittest b/unittests/Makefile.unittest
index b1c1d2c..8fbcfd2 100644
--- 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)