summaryrefslogtreecommitdiff
path: root/unittests/Makefile.unittest
diff options
context:
space:
mode:
authorJeffrey Yasskin <jyasskin@google.com>2010-01-26 23:30:46 +0000
committerJeffrey Yasskin <jyasskin@google.com>2010-01-26 23:30:46 +0000
commit9815582faddd8d6a194472e02ce408018d8cacec (patch)
tree8ea09c43e1e6e940bd43f9ca39a00ce9397ca79c /unittests/Makefile.unittest
parent0c81e34a546698723aeb4bcab5c85bd0ba93299a (diff)
Roll r94484 (avoiding RTTI problems in tests) forward again in a way that isn't
broken by setting CXXFLAGS on the command line. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@94619 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'unittests/Makefile.unittest')
-rw-r--r--unittests/Makefile.unittest6
1 files changed, 5 insertions, 1 deletions
diff --git a/unittests/Makefile.unittest b/unittests/Makefile.unittest
index 656f5e2f412..6fbef54691d 100644
--- a/unittests/Makefile.unittest
+++ b/unittests/Makefile.unittest
@@ -14,7 +14,11 @@
# Set up variables for building a unit test.
ifdef TESTNAME
-REQUIRES_RTTI = 1
+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