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 | 67f5ceaa82c14c613b8d264a2255f508d3a6a00d (patch) | |
tree | c726f9efba7fd9435ed8b797018ae9eb39d3b65a /llvm/utils/unittest/googletest | |
parent | 33f66e640ab5e23ad7436f47801994f7309b67e6 (diff) | |
download | bcm5719-llvm-67f5ceaa82c14c613b8d264a2255f508d3a6a00d.tar.gz bcm5719-llvm-67f5ceaa82c14c613b8d264a2255f508d3a6a00d.zip |
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
llvm-svn: 63882
Diffstat (limited to 'llvm/utils/unittest/googletest')
-rw-r--r-- | llvm/utils/unittest/googletest/Makefile | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/llvm/utils/unittest/googletest/Makefile b/llvm/utils/unittest/googletest/Makefile index 2d162a63801..db18296fe66 100644 --- a/llvm/utils/unittest/googletest/Makefile +++ b/llvm/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 |