aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew Innes2001-03-18 16:56:08 +0000
committerAndrew Innes2001-03-18 16:56:08 +0000
commit0f6465a643d70ff5a581cecb27dd92970776a243 (patch)
tree650bbe900cc2aeefc40c8c3165a022956cf7fd05
parent2afff93ade8207c8742da0fb156a37cbb58f0b82 (diff)
downloademacs-0f6465a643d70ff5a581cecb27dd92970776a243.tar.gz
emacs-0f6465a643d70ff5a581cecb27dd92970776a243.zip
(DEBUG_LINK): New macro.
(LINK_FLAGS): Use it.
-rw-r--r--nt/ChangeLog11
-rw-r--r--nt/gmake.defs4
-rw-r--r--nt/nmake.defs4
3 files changed, 17 insertions, 2 deletions
diff --git a/nt/ChangeLog b/nt/ChangeLog
index a293d589f24..166b584812a 100644
--- a/nt/ChangeLog
+++ b/nt/ChangeLog
@@ -1,3 +1,14 @@
12001-03-17 Andrew Innes <andrewi@gnu.org>
2
3 * cmdproxy.c (get_next_token): Fix indefinite loop bug scanning
4 escaped quotes.
5
6 * gmake.defs (DEBUG_LINK): New macro.
7 (LINK_FLAGS): Use it.
8
9 * nmake.defs (DEBUG_LINK): New macro.
10 (LINK_FLAGS): Use it.
11
12001-03-06 Andrew Innes <andrewi@gnu.org> 122001-03-06 Andrew Innes <andrewi@gnu.org>
2 13
3 * INSTALL: Add --ldflags to configure line for building with 14 * INSTALL: Add --ldflags to configure line for building with
diff --git a/nt/gmake.defs b/nt/gmake.defs
index 48806a72263..32b4dc7e0f8 100644
--- a/nt/gmake.defs
+++ b/nt/gmake.defs
@@ -226,8 +226,10 @@ endif
226 226
227ifdef NODEBUG 227ifdef NODEBUG
228DEBUG_FLAG = 228DEBUG_FLAG =
229DEBUG_LINK =
229else 230else
230DEBUG_FLAG = -g 231DEBUG_FLAG = -g
232DEBUG_LINK = -g
231endif 233endif
232 234
233ifdef NOCYGWIN 235ifdef NOCYGWIN
@@ -248,7 +250,7 @@ else
248ERROR Unknown architecture type "$(ARCH)". 250ERROR Unknown architecture type "$(ARCH)".
249endif 251endif
250 252
251LINK_FLAGS = $(ARCH_LDFLAGS) $(NOCYGWIN) $(USER_LDFLAGS) 253LINK_FLAGS = $(ARCH_LDFLAGS) $(DEBUG_LINK) $(NOCYGWIN) $(USER_LDFLAGS)
252 254
253.DEFAULT: 255.DEFAULT:
254 256
diff --git a/nt/nmake.defs b/nt/nmake.defs
index fb6dfdae282..1f6db21eaa0 100644
--- a/nt/nmake.defs
+++ b/nt/nmake.defs
@@ -161,8 +161,10 @@ DEL_TREE = rm -r
161 161
162!ifdef NODEBUG 162!ifdef NODEBUG
163DEBUG_FLAG = 163DEBUG_FLAG =
164DEBUG_LINK =
164!else 165!else
165DEBUG_FLAG = -Zi 166DEBUG_FLAG = -Zi
167DEBUG_LINK = -debug:full -debugtype:both
166!endif 168!endif
167 169
168!if "$(ARCH)" == "i386" 170!if "$(ARCH)" == "i386"
@@ -200,7 +202,7 @@ ARCH_LDFLAGS = $(SYS_LDFLAGS)
200!endif 202!endif
201!endif 203!endif
202 204
203LINK_FLAGS = $(ARCH_LDFLAGS) $(USER_LDFLAGS) 205LINK_FLAGS = $(ARCH_LDFLAGS) $(DEBUG_LINK) $(USER_LDFLAGS)
204 206
205# From MSVC 5.0 onwards, it seem base relocation information is not included, 207# From MSVC 5.0 onwards, it seem base relocation information is not included,
206# at least in release builds. We need to ensure the reloc info is included 208# at least in release builds. We need to ensure the reloc info is included