diff options
| author | Ben Key <bkey76@gmail.com> | 2011-05-06 23:00:12 -0500 |
|---|---|---|
| committer | Ben Key <bkey76@gmail.com> | 2011-05-06 23:00:12 -0500 |
| commit | 4d3fcc8e6025592929f95ac1e36b9313ffa6d4f0 (patch) | |
| tree | 3ec2f97c1b01856da3b1f3f65276a4dae325c1c7 /nt/gmake.defs | |
| parent | a3961c3e4d2a127cbaf4e20397855867259a7788 (diff) | |
| download | emacs-4d3fcc8e6025592929f95ac1e36b9313ffa6d4f0.tar.gz | |
* nt/configure.bat: Renamed the fusercflags variable to escusercflags
so that the variable name better matches its purpose, to be identical
to usercflags with the exception that all quotes are escaped by the \
character.
Renamed the fuserldflags variable to escuserldflags so that the
variable name better matches its purpose, to be identical to
userldflags with the exception that all quotes are escaped by the \
character.
A new ESC_USER_CFLAGS variable is written to config.settings. This
variable has the same value as the escusercflags variable.
* nt/gmake.defs, nt/nmake.defs: Added the variable ESC_CFLAGS. This
variable is identical to the CFLAGS variable except that it includes
the new ESC_USER_CFLAGS variable instead of USER_CFLAGS.
* src/makefile.w32-in: The bootstrap-temacs rule now makes use of one
of two shell specific rules, either bootstrap-temacs-CMD or
bootstrap-temacs-SH. The bootstrap-temacs-SH rule is identical to the
previous implementation of the bootstrap-temacs rule. The
bootstrap-temacs-CMD rule is similar to the previous implementation of
the bootstrap-temacs rule except that it makes use of the ESC_CFLAGS
variable instead of the CFLAGS variable.
These changes are required to extend my earlier fix to add support for
--cflags and --ldflags options that include quotes so that it works
whether make uses cmd or sh as the shell.
Diffstat (limited to 'nt/gmake.defs')
| -rw-r--r-- | nt/gmake.defs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/nt/gmake.defs b/nt/gmake.defs index dcc43c985a5..bbb560264c5 100644 --- a/nt/gmake.defs +++ b/nt/gmake.defs @@ -206,6 +206,7 @@ CHECKING_CFLAGS = endif CFLAGS = -I. $(ARCH_CFLAGS) $(DEBUG_CFLAGS) $(CHECKING_CFLAGS) $(PROFILE_CFLAGS) $(USER_CFLAGS) $(LOCAL_FLAGS) +ESC_CFLAGS = -I. $(ARCH_CFLAGS) $(DEBUG_CFLAGS) $(CHECKING_CFLAGS) $(PROFILE_CFLAGS) $(ESC_USER_CFLAGS) $(LOCAL_FLAGS) EMACS_EXTRA_C_FLAGS = -DUSE_CRT_DLL=1 ifdef PROFILE |