summaryrefslogtreecommitdiffstats
path: root/llvm/utils/unittest/googletest
diff options
context:
space:
mode:
authorChandler Carruth <chandlerc@gmail.com>2010-03-09 22:45:10 +0000
committerChandler Carruth <chandlerc@gmail.com>2010-03-09 22:45:10 +0000
commit25fcb6117256e47390227c038993a54d8e1ad6ba (patch)
tree77461aae49aa2dacea74e5a0710e3ee2de63ee7e /llvm/utils/unittest/googletest
parent4497475905af32034dcfb7cf47028b478b2a039f (diff)
downloadbcm5719-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/googletest')
-rw-r--r--llvm/utils/unittest/googletest/Makefile3
1 files changed, 2 insertions, 1 deletions
diff --git a/llvm/utils/unittest/googletest/Makefile b/llvm/utils/unittest/googletest/Makefile
index 688a5bda812..1ec979d961e 100644
--- a/llvm/utils/unittest/googletest/Makefile
+++ b/llvm/utils/unittest/googletest/Makefile
@@ -16,7 +16,8 @@ BUILD_ARCHIVE = 1
REQUIRES_RTTI = 1
# Note that these flags are duplicated when building individual tests in
-# unittests/Makefile.unittest; ensure that any changes are made to both.
+# unittests/Makefile.unittest and ../UnitTestMain/Makefile; ensure that any
+# changes are made to both.
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
OpenPOWER on IntegriCloud