procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix treatment of ld's nocombreloc option

Browse source 
* configure.ac (LDFLAGS_NOCOMBRELOC): New variable.
(LDFLAGS): Move nocombreloc option from here...
(LD_SWITCH_SYSTEM_TEMACS): ... to here.
This is an essential option that should not be in LDFLAGS,
because the user may override that at build time; eg
http://bugs.debian.org/684788.  temacs is the only thing
that actually needs this option; this is where it was orginally:
http://lists.gnu.org/archive/html/emacs-pretest-bug/2004-03/msg00170.html
This commit is contained in:
Glenn Morris 2013-09-09 00:34:15 -07:00
parent 66f3731f43
commit 8d17ef8d54
2 changed files with 19 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
ChangeLog
View file

@ -1,3 +1,14 @@
2013-09-09 Glenn Morris <rgm@gnu.org>
* configure.ac (LDFLAGS_NOCOMBRELOC): New variable.
(LDFLAGS): Move nocombreloc option from here...
(LD_SWITCH_SYSTEM_TEMACS): ... to here.
This is an essential option that should not be in LDFLAGS,
because the user may override that at build time; eg
http://bugs.debian.org/684788. temacs is the only thing
that actually needs this option; this is where it was orginally:
http://lists.gnu.org/archive/html/emacs-pretest-bug/2004-03/msg00170.html
2013-09-08 Glenn Morris <rgm@gnu.org>
* configure.ac (--without-compress-install):

11
configure.ac
View file

@ -1028,17 +1028,20 @@ dnl if not built to support GNU ld.
late_LDFLAGS=$LDFLAGS
if test x$GCC = xyes; then
LDFLAGS="$LDFLAGS -Wl,-znocombreloc"
LDFLAGS_NOCOMBRELOC="-Wl,-znocombreloc"
else
LDFLAGS="$LDFLAGS -znocombreloc"
LDFLAGS_NOCOMBRELOC="-znocombreloc"
fi
LDFLAGS="$LDFLAGS $LDFLAGS_NOCOMBRELOC"
AC_MSG_CHECKING([for -znocombreloc])
AC_LINK_IFELSE([AC_LANG_PROGRAM([], [])],
[AC_MSG_RESULT(yes)],
LDFLAGS=$late_LDFLAGS
LDFLAGS_NOCOMBRELOC=
[AC_MSG_RESULT(no)])
LDFLAGS=$late_LDFLAGS
dnl The function dump-emacs will not be defined and temacs will do
dnl (load "loadup") automatically unless told otherwise.
@ -4740,6 +4743,8 @@ if test x$ac_enable_profiling != x ; then
esac
fi
LD_SWITCH_SYSTEM_TEMACS="$LDFLAGS_NOCOMBRELOC $LD_SWITCH_SYSTEM_TEMACS"
AC_SUBST(LD_SWITCH_SYSTEM_TEMACS)
## MinGW-specific post-link processing of temacs.