diff options
| author | Chandler Carruth <chandlerc@gmail.com> | 2010-03-09 19:24:49 +0000 |
|---|---|---|
| committer | Chandler Carruth <chandlerc@gmail.com> | 2010-03-09 19:24:49 +0000 |
| commit | f10e43ee7e3cb171e44c201e133fa153778d0da4 (patch) | |
| tree | 5a7798a3a12edaaca53f5bcc42c2e6ca730312c7 /utils/unittest | |
| parent | 4e501545cd12d903d35096f42eb5fdbe4603d5da (diff) | |
| download | llvm-f10e43ee7e3cb171e44c201e133fa153778d0da4.tar.gz llvm-f10e43ee7e3cb171e44c201e133fa153778d0da4.tar.bz2 llvm-f10e43ee7e3cb171e44c201e133fa153778d0da4.tar.xz | |
Consolidate GoogleTest make options and duplicate them to its own makefile.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@98074 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'utils/unittest')
| -rw-r--r-- | utils/unittest/googletest/Makefile | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/utils/unittest/googletest/Makefile b/utils/unittest/googletest/Makefile index 15bbf4e69e..688a5bda81 100644 --- a/utils/unittest/googletest/Makefile +++ b/utils/unittest/googletest/Makefile @@ -14,8 +14,17 @@ include $(LEVEL)/Makefile.config LIBRARYNAME = GoogleTest 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. 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 + ifeq ($(HOST_OS),MingW) CPP.Flags += -DGTEST_OS_WINDOWS=1 |