diff options
| author | Andrew Innes | 2001-03-18 16:56:08 +0000 |
|---|---|---|
| committer | Andrew Innes | 2001-03-18 16:56:08 +0000 |
| commit | 0f6465a643d70ff5a581cecb27dd92970776a243 (patch) | |
| tree | 650bbe900cc2aeefc40c8c3165a022956cf7fd05 | |
| parent | 2afff93ade8207c8742da0fb156a37cbb58f0b82 (diff) | |
| download | emacs-0f6465a643d70ff5a581cecb27dd92970776a243.tar.gz emacs-0f6465a643d70ff5a581cecb27dd92970776a243.zip | |
(DEBUG_LINK): New macro.
(LINK_FLAGS): Use it.
| -rw-r--r-- | nt/ChangeLog | 11 | ||||
| -rw-r--r-- | nt/gmake.defs | 4 | ||||
| -rw-r--r-- | nt/nmake.defs | 4 |
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 @@ | |||
| 1 | 2001-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 | |||
| 1 | 2001-03-06 Andrew Innes <andrewi@gnu.org> | 12 | 2001-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 | ||
| 227 | ifdef NODEBUG | 227 | ifdef NODEBUG |
| 228 | DEBUG_FLAG = | 228 | DEBUG_FLAG = |
| 229 | DEBUG_LINK = | ||
| 229 | else | 230 | else |
| 230 | DEBUG_FLAG = -g | 231 | DEBUG_FLAG = -g |
| 232 | DEBUG_LINK = -g | ||
| 231 | endif | 233 | endif |
| 232 | 234 | ||
| 233 | ifdef NOCYGWIN | 235 | ifdef NOCYGWIN |
| @@ -248,7 +250,7 @@ else | |||
| 248 | ERROR Unknown architecture type "$(ARCH)". | 250 | ERROR Unknown architecture type "$(ARCH)". |
| 249 | endif | 251 | endif |
| 250 | 252 | ||
| 251 | LINK_FLAGS = $(ARCH_LDFLAGS) $(NOCYGWIN) $(USER_LDFLAGS) | 253 | LINK_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 |
| 163 | DEBUG_FLAG = | 163 | DEBUG_FLAG = |
| 164 | DEBUG_LINK = | ||
| 164 | !else | 165 | !else |
| 165 | DEBUG_FLAG = -Zi | 166 | DEBUG_FLAG = -Zi |
| 167 | DEBUG_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 | ||
| 203 | LINK_FLAGS = $(ARCH_LDFLAGS) $(USER_LDFLAGS) | 205 | LINK_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 |