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 | 6d7deae2df84b628868c49e5598f45a7a47a201d (patch) | |
| tree | 9cb237ea4ae0db6d5409e48d9631b4e920efa154 /llvm/unittests/Makefile.unittest | |
| parent | 2b17e2a452015b8a9c12722a071de3415da13d5d (diff) | |
| download | bcm5719-llvm-6d7deae2df84b628868c49e5598f45a7a47a201d.tar.gz bcm5719-llvm-6d7deae2df84b628868c49e5598f45a7a47a201d.zip | |
Roll r94484 (avoiding RTTI problems in tests) forward again in a way that isn't
broken by setting CXXFLAGS on the command line.
llvm-svn: 94619
Diffstat (limited to 'llvm/unittests/Makefile.unittest')
| -rw-r--r-- | llvm/unittests/Makefile.unittest | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/llvm/unittests/Makefile.unittest b/llvm/unittests/Makefile.unittest index 656f5e2f412..6fbef54691d 100644 --- a/llvm/unittests/Makefile.unittest +++ b/llvm/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 |
