[llvm-commits] [llvm] r64589 - /llvm/branches/Apple/Dib/utils/unittest/googletest/Makefile

[Bill Wendling]

Author: void
Date: Sun Feb 15 05:56:52 2009
New Revision: 64589

URL: http://llvm.org/viewvc/llvm-project?rev=64589&view=rev
Log:
Merge r64514 from release_25:

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

Modified:
    llvm/branches/Apple/Dib/utils/unittest/googletest/Makefile

Modified: llvm/branches/Apple/Dib/utils/unittest/googletest/Makefile
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/Dib/utils/unittest/googletest/Makefile?rev=64589&r1=64588&r2=64589&view=diff

==============================================================================
--- llvm/branches/Apple/Dib/utils/unittest/googletest/Makefile (original)
+++ llvm/branches/Apple/Dib/utils/unittest/googletest/Makefile Sun Feb 15 05:56:52 2009
@@ -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