diff options
| author | Chandler Carruth <chandlerc@gmail.com> | 2010-03-09 22:45:10 +0000 |
|---|---|---|
| committer | Chandler Carruth <chandlerc@gmail.com> | 2010-03-09 22:45:10 +0000 |
| commit | 25fcb6117256e47390227c038993a54d8e1ad6ba (patch) | |
| tree | 77461aae49aa2dacea74e5a0710e3ee2de63ee7e /llvm/utils/unittest/UnitTestMain | |
| parent | 4497475905af32034dcfb7cf47028b478b2a039f (diff) | |
| download | bcm5719-llvm-25fcb6117256e47390227c038993a54d8e1ad6ba.tar.gz bcm5719-llvm-25fcb6117256e47390227c038993a54d8e1ad6ba.zip | |
Continue propagating the GoogleTest flags until we can update our version to
eliminate this problem. This will hopefully let us make progress on Linux
bootstrapping.
llvm-svn: 98095
Diffstat (limited to 'llvm/utils/unittest/UnitTestMain')
| -rw-r--r-- | llvm/utils/unittest/UnitTestMain/Makefile | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/llvm/utils/unittest/UnitTestMain/Makefile b/llvm/utils/unittest/UnitTestMain/Makefile index 328d5e2917f..5c1004942db 100644 --- a/llvm/utils/unittest/UnitTestMain/Makefile +++ b/llvm/utils/unittest/UnitTestMain/Makefile @@ -14,7 +14,13 @@ include $(LEVEL)/Makefile.config LIBRARYNAME = UnitTestMain BUILD_ARCHIVE = 1 REQUIRES_RTTI = 1 + CPP.Flags += -I$(LLVM_SRC_ROOT)/utils/unittest/googletest/include CPP.Flags += $(NO_MISSING_FIELD_INITIALIZERS) $(NO_VARIADIC_MACROS) +CPP.Flags += -DGTEST_HAS_RTTI=0 +# libstdc++'s TR1 <tuple> header depends on RTTI and uses C++'0x features not +# supported by Clang, 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 |
