* lib/makefile.w32-in (PRAGMA_SYSTEM_HEADER): Move to platform

specific makefiles to support getopt_.h generation with MSVC.

* nt/gmake.defs (PRAGMA_SYSTEM_HEADER): Add for GCC.

* nt/nmake.defs (PRAGMA_SYSTEM_HEADER): Add, but ignore with MSVC.

diff --git a/ChangeLog b/ChangeLog
index 9712a2f0d0f70a3f1d0411d892fac1ca44087705..f36c25ba5a1c3cd35a305324e559150ef9adfabb 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-02-05  Christoph Scholtes  <cschol2112@googlemail.com>
+
+       * lib/makefile.w32-in (PRAGMA_SYSTEM_HEADER): Move to platform
+       specific makefiles to support getopt_.h generation with MSVC.
+
 2012-02-04  Glenn Morris  <rgm@gnu.org>
 
        * Makefile.in (uninstall):

diff --git a/lib/makefile.w32-in b/lib/makefile.w32-in
index ccc0cf6a59584deab77740e0c66f4aaac8412c4f..3600406ac134cf47fb53eb9483d134184f2d2465 100644 (file)
--- a/lib/makefile.w32-in
+++ b/lib/makefile.w32-in
@@ -213,7 +213,6 @@ getopt_.h-SH: doit
 
 HAVE_GETOPT_H = HAVE_GETOPT_H
 INCLUDE_NEXT = include_next
-PRAGMA_SYSTEM_HEADER = \#pragma GCC system_header
 PRAGMA_COLUMNS =
 NEXT_GETOPT_H = <getopt.h>
 ARG_NONNULL_H = ../build-aux/snippet/arg-nonnull.h

diff --git a/nt/ChangeLog b/nt/ChangeLog
index ce3322c8f00abd70ece98a030c0b4c1cb8d5005d..f34fe11084c7e04d8f06363904bbf07a3c79a86d 100644 (file)
--- a/nt/ChangeLog
+++ b/nt/ChangeLog
@@ -1,5 +1,9 @@
 2012-02-05  Christoph Scholtes  <cschol2112@googlemail.com>
 
+       * gmake.defs (PRAGMA_SYSTEM_HEADER): Add for GCC.
+
+       * nmake.defs (PRAGMA_SYSTEM_HEADER): Add, but ignore with MSVC.
+
        * makefile.w32-in (maybe-copy-distfiles)
        (maybe-copy-distfiles-CMD, maybe-copy-distfiles-SH)
        (create-tmp-dist-dir): Added to make --distfiles optional.

diff --git a/nt/gmake.defs b/nt/gmake.defs
index e58ee4f3213d1d0889c6db42616c8ea515e3c68c..6839b28b97550228ba3edf3ca1557de4536ac9a4 100644 (file)
--- a/nt/gmake.defs
+++ b/nt/gmake.defs
@@ -289,6 +289,8 @@ ifdef USER_LIBS
 USER_LIBS := $(patsubst %,-l%,$(USER_LIBS))
 endif
 
+PRAGMA_SYSTEM_HEADER = \#pragma GCC system_header
+
 ifeq "$(ARCH)" "i386"
 ifdef NOOPT
 ARCH_CFLAGS     = -c $(DEBUG_FLAG) $(NOCYGWIN)

diff --git a/nt/nmake.defs b/nt/nmake.defs
index a143fe65fac0fa0aaef0df20d93c68ddcdd58a84..2cb3113ca9ad601f274d8f0dfa51ed08a2d5e0ec 100644 (file)
--- a/nt/nmake.defs
+++ b/nt/nmake.defs
@@ -203,6 +203,9 @@ DEBUG_LINK = -debug
 D = d\r
 !endif\r
 \r
+# gcc-specific pragma (ignore for MSVC)\r
+PRAGMA_SYSTEM_HEADER =\r
+\r
 !if "$(ARCH)" == "i386"\r
 !ifdef NOOPT\r
 #ARCH_CFLAGS     = -nologo -c -Zel -W2 -H63 -Od -G3d -Zp8 $(DEBUG_FLAG)\r