[Emacs-diffs] trunk r114176: Fix treatment of ld's nocombreloc option

[Glenn Morris]

------------------------------------------------------------
revno: 114176
revision-id: address@hidden
parent: address@hidden
committer: Glenn Morris <address@hidden>
branch nick: trunk
timestamp: Mon 2013-09-09 00:34:15 -0700
message:
  Fix treatment of ld's nocombreloc option
  
  * 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
modified:
  ChangeLog                      changelog-20091113204419-o5vbwnq5f7feedwu-1538
  configure.ac                   
configure.in-20091113204419-o5vbwnq5f7feedwu-783

=== modified file 'ChangeLog'
--- a/ChangeLog 2013-09-08 23:50:23 +0000
+++ b/ChangeLog 2013-09-09 07:34:15 +0000
@@ -1,3 +1,14 @@
+2013-09-09  Glenn Morris  <address@hidden>
+
+       * 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  <address@hidden>
 
        * configure.ac (--without-compress-install):

=== modified file 'configure.ac'
--- a/configure.ac      2013-09-09 00:10:58 +0000
+++ b/configure.ac      2013-09-09 07:34:15 +0000
@@ -1028,17 +1028,20 @@
 
 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 @@
   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.