diff options
| author | Daniel Dunbar <daniel@zuster.org> | 2009-09-20 06:17:12 +0000 |
|---|---|---|
| committer | Daniel Dunbar <daniel@zuster.org> | 2009-09-20 06:17:12 +0000 |
| commit | b18efec822dcd6e3299f07414a431468164df742 (patch) | |
| tree | 5f2acabb854ce49b5b9f07e9180b54a693d0feb7 | |
| parent | 00f53807c3833791756e7b60b498919732984891 (diff) | |
| download | bcm5719-llvm-b18efec822dcd6e3299f07414a431468164df742.tar.gz bcm5719-llvm-b18efec822dcd6e3299f07414a431468164df742.zip | |
Follow googletest logic for suppressing warnings in unittests/UnitTestMain.
llvm-svn: 82373
| -rw-r--r-- | llvm/utils/unittest/UnitTestMain/Makefile | 4 | ||||
| -rw-r--r-- | llvm/utils/unittest/googletest/Makefile | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/llvm/utils/unittest/UnitTestMain/Makefile b/llvm/utils/unittest/UnitTestMain/Makefile index 07a74e3c0db..aadff217aad 100644 --- a/llvm/utils/unittest/UnitTestMain/Makefile +++ b/llvm/utils/unittest/UnitTestMain/Makefile @@ -10,10 +10,12 @@ 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_VARIADIC_MACROS := $(shell $(CXX) -Wno-variadic-macros -fsyntax-only -xc /dev/null 2>/dev/null && echo -Wno-variadic-macros) LIBRARYNAME = UnitTestMain BUILD_ARCHIVE = 1 CPP.Flags += -I$(LLVM_SRC_ROOT)/utils/unittest/googletest/include -CPP.Flags += -Wno-variadic-macros +CPP.Flags += $(NO_MISSING_FIELD_INITIALIZERS) $(NO_VARIADIC_MACROS) include $(LEVEL)/Makefile.common diff --git a/llvm/utils/unittest/googletest/Makefile b/llvm/utils/unittest/googletest/Makefile index 2e0bf72a62a..29fe679a9b3 100644 --- a/llvm/utils/unittest/googletest/Makefile +++ b/llvm/utils/unittest/googletest/Makefile @@ -8,11 +8,11 @@ ##===----------------------------------------------------------------------===## 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_VARIADIC_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 |
