[llvm-commits] [llvm] r81719 - in /llvm/trunk: unittests/Makefile unittests/TestMain.cpp utils/unittest/Makefile utils/unittest/UnitTestMain/ utils/unittest/UnitTestMain/Makefile utils/unittest/UnitTestMain/TestMain.cpp

[Julien Lerouge]

On Sun, Sep 13, 2009 at 09:31:21PM +0000, Daniel Dunbar wrote:
> Author: ddunbar
> Date: Sun Sep 13 16:31:21 2009
> New Revision: 81719
> 
> ==============================================================================
> --- llvm/trunk/unittests/Makefile (original)
> +++ llvm/trunk/unittests/Makefile Sun Sep 13 16:31:21 2009
> @@ -9,13 +9,6 @@
>  
>  LEVEL = ..
>  
> -include $(LEVEL)/Makefile.config
> -
> -LIBRARYNAME = UnitTestMain
> -BUILD_ARCHIVE = 1
> -CPP.Flags += -I$(LLVM_SRC_ROOT)/utils/unittest/googletest/include
> -CPP.Flags += -Wno-variadic-macros
> -
>  PARALLEL_DIRS = ADT ExecutionEngine Support VMCore
>  
>  include $(LEVEL)/Makefile.common
> 
> Removed: llvm/trunk/unittests/TestMain.cpp
> URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/unittests/TestMain.cpp?rev=81718&view=auto
> 
> ==============================================================================
> --- llvm/trunk/unittests/Makefile (original)
> +++ llvm/trunk/utils/unittest/UnitTestMain/Makefile Sun Sep 13 16:31:21 2009
> @@ -16,9 +16,4 @@
>  CPP.Flags += -I$(LLVM_SRC_ROOT)/utils/unittest/googletest/include
>  CPP.Flags += -Wno-variadic-macros
>  

-Wno-variadic-macros is not supported with older GCC, can we re-use the
logic in googletest/Makefile ? patch attached.

Let me know,
Julien

-- 
Julien Lerouge
PGP Key Id: 0xB1964A62
PGP Fingerprint: 392D 4BAD DB8B CE7F 4E5F FA3C 62DB 4AA7 B196 4A62
PGP Public Key from: keyserver.pgp.com
-------------- next part --------------
Index: UnitTestMain/Makefile
===================================================================
--- UnitTestMain/Makefile	(revision 82218)
+++ UnitTestMain/Makefile	(working copy)
@@ -14,6 +14,5 @@
 LIBRARYNAME = UnitTestMain
 BUILD_ARCHIVE = 1
 CPP.Flags += -I$(LLVM_SRC_ROOT)/utils/unittest/googletest/include
-CPP.Flags += -Wno-variadic-macros
 
 include $(LEVEL)/Makefile.common
Index: googletest/Makefile
===================================================================
--- googletest/Makefile	(revision 82218)
+++ googletest/Makefile	(working copy)
@@ -8,15 +8,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 = GoogleTest
 BUILD_ARCHIVE = 1
 CPP.Flags += -I$(LLVM_SRC_ROOT)/utils/unittest/googletest/include
-CPP.Flags += $(NO_MISSING_FIELD_INITIALIZERS) $(NO_VARIADIC_MACROS)
 
 ifeq ($(HOST_OS),MingW)
   CPP.Flags += -DGTEST_OS_WINDOWS=1
Index: Makefile
===================================================================
--- Makefile	(revision 82218)
+++ Makefile	(working copy)
@@ -8,6 +8,16 @@
 ##===----------------------------------------------------------------------===##
 
 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)
+CPP.Flags += $(NO_MISSING_FIELD_INITIALIZERS) $(NO_VARIADIC_MACROS)
+
 PARALLEL_DIRS = googletest UnitTestMain
 
 include $(LEVEL)/Makefile.common