From 6d7deae2df84b628868c49e5598f45a7a47a201d Mon Sep 17 00:00:00 2001 From: Jeffrey Yasskin Date: Tue, 26 Jan 2010 23:30:46 +0000 Subject: 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 --- llvm/unittests/Makefile.unittest | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'llvm/unittests/Makefile.unittest') 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 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 -- cgit v1.2.3