diff options
| author | Glenn Morris <[email protected]> | 2014-06-15 10:45:38 -0700 |
|---|---|---|
| committer | Glenn Morris <[email protected]> | 2014-06-15 10:45:38 -0700 |
| commit | b24ffa815c1ff9e581f261fdb63b6901196bbc8c (patch) | |
| tree | 44826e5c6b912e9150dcd1752df17ac7c1fc45f9 /nt | |
| parent | 9fae211dbf3a1362866668acc9a7017f79d57b98 (diff) | |
Explicitly set LDFLAGS in some sub-Makefiles
* lib-src/Makefile.in (LDFLAGS): Explicitly set via configure.
* nt/Makefile.in (LDFLAGS): Explicitly set via configure.
Diffstat (limited to 'nt')
| -rw-r--r-- | nt/ChangeLog | 4 | ||||
| -rw-r--r-- | nt/Makefile.in | 5 |
2 files changed, 8 insertions, 1 deletions
diff --git a/nt/ChangeLog b/nt/ChangeLog index 32e44a6594..9c7328e917 100644 --- a/nt/ChangeLog +++ b/nt/ChangeLog @@ -1,3 +1,7 @@ +2014-06-15 Glenn Morris <[email protected]> + + * Makefile.in (LDFLAGS): Explicitly set via configure. + 2014-06-15 Eli Zaretskii <[email protected]> * Makefile.in (CPPFLAGS): Define. diff --git a/nt/Makefile.in b/nt/Makefile.in index 2641643042..f612af298d 100644 --- a/nt/Makefile.in +++ b/nt/Makefile.in @@ -25,7 +25,9 @@ SHELL = /bin/sh CC=@CC@ CFLAGS=@CFLAGS@ -CPPFLAGS=@CPPFLAGS@ +CPPFLAGS = @CPPFLAGS@ +LDFLAGS = @LDFLAGS@ + version=@version@ ## Used in $archlibdir. configuration=@configuration@ @@ -141,6 +143,7 @@ BASE_CFLAGS = $(C_SWITCH_SYSTEM) $(C_SWITCH_MACHINE) \ $(WARN_CFLAGS) $(WERROR_CFLAGS) \ -I. -I${srcdir} +## FIXME? What is LDFLAGS doing here? ALL_CFLAGS = ${BASE_CFLAGS} ${PROFILING_CFLAGS} ${LDFLAGS} ${CPPFLAGS} ${CFLAGS} LINK_CFLAGS = ${BASE_CFLAGS} ${LDFLAGS} ${CFLAGS} CPP_CFLAGS = ${BASE_CFLAGS} ${PROFILING_CFLAGS} ${CPPFLAGS} ${CFLAGS} |