diff options
| author | Mike Stump <mrs@apple.com> | 2009-02-05 20:45:27 +0000 |
|---|---|---|
| committer | Mike Stump <mrs@apple.com> | 2009-02-05 20:45:27 +0000 |
| commit | 44460da59175c7f56d403f961ca5b25323a169a1 (patch) | |
| tree | 7e04d30a5ae487a87b90d5fd96955b5ea6cdc86e /utils/unittest | |
| parent | 39c873e38f3b173b51bd9d3d3b4ec1381b829754 (diff) | |
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/trunk@63882 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'utils/unittest')
| -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 |