summaryrefslogtreecommitdiff
path: root/unittests/Makefile.unittest
diff options
context:
space:
mode:
authorJeffrey Yasskin <jyasskin@google.com>2010-01-26 01:26:46 +0000
committerJeffrey Yasskin <jyasskin@google.com>2010-01-26 01:26:46 +0000
commitf5fe3beb3ad2664cfc14a22bb075ebb8e09540c3 (patch)
tree24db675a00da8ef7a1894b063491a12b23536946 /unittests/Makefile.unittest
parent7dcef4c47578befe40d488c953e3f5b328667300 (diff)
Re-enable unit tests disabled in r94164 by telling GTest about the
lack of RTTI. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@94484 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..65638b2a4f6 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
+CXXFLAGS += -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.
+CXXFLAGS += -DGTEST_HAS_TR1_TUPLE=0
include $(LEVEL)/Makefile.common