Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
emacs
emacs
Commits
48b48f98
Commit
48b48f98
authored
Sep 09, 2013
by
Glenn Morris
Browse files
Convert ChangeLog text to in-file comment
parent
83fc0554
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
11 additions
and
7 deletions
+11
-7
ChangeLog
ChangeLog
+0
-5
configure.ac
configure.ac
+11
-2
No files found.
ChangeLog
View file @
48b48f98
...
...
@@ -3,11 +3,6 @@
* 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
View file @
48b48f98
...
...
@@ -1026,7 +1026,16 @@ dnl (Don't use `-z nocombreloc' as -z takes no arg on Irix.)
dnl Treat GCC specially since it just gives a non-fatal `unrecognized option'
dnl if not built to support GNU ld.
late_LDFLAGS=$LDFLAGS
dnl For a long time, this was added to LDFLAGS rather than
dnl LD_SWITCH_SYSTEM_TEMACS. That is: i) inappropriate, since
dnl LDFLAGS is supposed to be a user option, and this flag is
dnl essential. It can leads to problems if the user overrides
dnl LDFLAGS at _build_ time (make LDFLAGS=... all), eg
dnl http://bugs.debian.org/684788.
dnl ii) unnecessary, since temacs is the only thing
dnl that actually needs this option - this is where it was orginally:
dnl http://lists.gnu.org/archive/html/emacs-pretest-bug/2004-03/msg00170.html
late_LDFLAGS="$LDFLAGS"
if test x$GCC = xyes; then
LDFLAGS_NOCOMBRELOC="-Wl,-znocombreloc"
else
...
...
@@ -1041,7 +1050,7 @@ AC_LINK_IFELSE([AC_LANG_PROGRAM([], [])],
LDFLAGS_NOCOMBRELOC=
[AC_MSG_RESULT(no)])
LDFLAGS=$late_LDFLAGS
LDFLAGS=
"
$late_LDFLAGS
"
dnl The function dump-emacs will not be defined and temacs will do
dnl (load "loadup") automatically unless told otherwise.
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment