diff options
| author | Christoph Scholtes <cschol2112@gmail.com> | 2012-02-05 13:40:36 -0700 |
|---|---|---|
| committer | Christoph Scholtes <cschol2112@gmail.com> | 2012-02-05 13:40:36 -0700 |
| commit | 7519763363bcb835f5387784bce5251ea1beb71e (patch) | |
| tree | f1ea6be04df33b8d75d63ad6ac8a855acea8d9dc | |
| parent | d452256dd8168b502a22a4af6c6409d7aebc51bd (diff) | |
| download | emacs-7519763363bcb835f5387784bce5251ea1beb71e.tar.gz | |
* 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.
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | lib/makefile.w32-in | 1 | ||||
| -rw-r--r-- | nt/ChangeLog | 4 | ||||
| -rw-r--r-- | nt/gmake.defs | 2 | ||||
| -rw-r--r-- | nt/nmake.defs | 3 |
5 files changed, 14 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog index 9712a2f0d0f..f36c25ba5a1 100644 --- 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 ccc0cf6a595..3600406ac13 100644 --- 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 ce3322c8f00..f34fe11084c 100644 --- 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 e58ee4f3213..6839b28b975 100644 --- 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 a143fe65fac..2cb3113ca9a 100644 --- a/nt/nmake.defs +++ b/nt/nmake.defs @@ -203,6 +203,9 @@ DEBUG_LINK = -debug D = d
!endif
+# gcc-specific pragma (ignore for MSVC)
+PRAGMA_SYSTEM_HEADER =
+
!if "$(ARCH)" == "i386"
!ifdef NOOPT
#ARCH_CFLAGS = -nologo -c -Zel -W2 -H63 -Od -G3d -Zp8 $(DEBUG_FLAG)
|