diff options
| author | Jeffrey Yasskin <jyasskin@google.com> | 2010-01-26 01:26:46 +0000 |
|---|---|---|
| committer | Jeffrey Yasskin <jyasskin@google.com> | 2010-01-26 01:26:46 +0000 |
| commit | 27dc00f893d3085e20ab35a502814a7f0908d898 (patch) | |
| tree | 24db675a00da8ef7a1894b063491a12b23536946 /unittests/Makefile.unittest | |
| parent | 8bb3b9e5517194ac2b7a93a347489953c526f5c4 (diff) | |
| download | external_llvm-27dc00f893d3085e20ab35a502814a7f0908d898.zip external_llvm-27dc00f893d3085e20ab35a502814a7f0908d898.tar.gz external_llvm-27dc00f893d3085e20ab35a502814a7f0908d898.tar.bz2 | |
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.unittest | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/unittests/Makefile.unittest b/unittests/Makefile.unittest index 656f5e2..65638b2 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 |