[llvm-commits] [llvm] r82373 - in /llvm/trunk/utils/unittest: UnitTestMain/Makefile googletest/Makefile

[Daniel Dunbar]

Author: ddunbar
Date: Sun Sep 20 01:17:12 2009
New Revision: 82373

URL: http://llvm.org/viewvc/llvm-project?rev=82373&view=rev
Log:
Follow googletest logic for suppressing warnings in unittests/UnitTestMain.

Modified:
    llvm/trunk/utils/unittest/UnitTestMain/Makefile
    llvm/trunk/utils/unittest/googletest/Makefile

Modified: llvm/trunk/utils/unittest/UnitTestMain/Makefile
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/unittest/UnitTestMain/Makefile?rev=82373&r1=82372&r2=82373&view=diff

==============================================================================
--- llvm/trunk/utils/unittest/UnitTestMain/Makefile (original)
+++ llvm/trunk/utils/unittest/UnitTestMain/Makefile Sun Sep 20 01:17:12 2009
@@ -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

Modified: llvm/trunk/utils/unittest/googletest/Makefile
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/unittest/googletest/Makefile?rev=82373&r1=82372&r2=82373&view=diff

==============================================================================
--- llvm/trunk/utils/unittest/googletest/Makefile (original)
+++ llvm/trunk/utils/unittest/googletest/Makefile Sun Sep 20 01:17:12 2009
@@ -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