diff options
| author | Jeffrey Yasskin <jyasskin@google.com> | 2010-01-26 23:30:46 +0000 |
|---|---|---|
| committer | Jeffrey Yasskin <jyasskin@google.com> | 2010-01-26 23:30:46 +0000 |
| commit | 9815582faddd8d6a194472e02ce408018d8cacec (patch) | |
| tree | 8ea09c43e1e6e940bd43f9ca39a00ce9397ca79c /unittests/Makefile.unittest | |
| parent | 0c81e34a546698723aeb4bcab5c85bd0ba93299a (diff) | |
| download | llvm-9815582faddd8d6a194472e02ce408018d8cacec.tar.gz llvm-9815582faddd8d6a194472e02ce408018d8cacec.tar.bz2 llvm-9815582faddd8d6a194472e02ce408018d8cacec.tar.xz | |
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.unittest | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/unittests/Makefile.unittest b/unittests/Makefile.unittest index 656f5e2f41..6fbef54691 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 |