diff options
| author | Tanya Lattner <tonic@nondot.org> | 2009-02-14 00:43:29 +0000 |
|---|---|---|
| committer | Tanya Lattner <tonic@nondot.org> | 2009-02-14 00:43:29 +0000 |
| commit | 94bfd870ff6b60a54ad9584c066d7ba1602f3136 (patch) | |
| tree | 21dc6fcff665600d7e623ab4bf1969f429cd8b91 | |
| parent | c1a60e850e9f8bfe2a4cd6cc8774ca34b35cbdc6 (diff) | |
Merge from mainline.
Probe for flags before using them to try to help compiling with
compilers that don't support those flags. This hopefully will help
gcc 3.X compile this code. http://llvm.org/PR3487
git-svn-id: https://llvm.org/svn/llvm-project/llvm/branches/release_25@64514 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | utils/unittest/googletest/Makefile | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/utils/unittest/googletest/Makefile b/utils/unittest/googletest/Makefile index 2d162a6380..db18296fe6 100644 --- a/utils/unittest/googletest/Makefile +++ b/utils/unittest/googletest/Makefile @@ -9,10 +9,13 @@ LEVEL := ../../.. include $(LEVEL)/Makefile.config +NO_MISSING_FIELD_INITIALIZERS := $(shell $(CXX) -Wno-missing-field-initializers -fsyntax-only -xc /dev/null 2>/dev/null && echo -Wno-missing-field-initializers) +NO_VAROADIC_MACROS := $(shell $(CXX) -Wno-variadic-macros -fsyntax-only -xc /dev/null 2>/dev/null && echo -Wno-variadic-macros) + LIBRARYNAME = GoogleTest BUILD_ARCHIVE = 1 CPP.Flags += -I$(LLVM_SRC_ROOT)/utils/unittest/googletest/include/ -CPP.Flags += -Wno-missing-field-initializers -Wno-variadic-macros +CPP.Flags += $(NO_MISSING_FIELD_INITIALIZERS) $(NO_VAROADIC_MACROS) include $(LEVEL)/Makefile.common |