aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggert2013-05-12 23:23:08 -0700
committerPaul Eggert2013-05-12 23:23:08 -0700
commitbb8eb35723ef08983b45382a442df90a4e48b3d3 (patch)
treee5ca321fe6d07922531df34edb08e52156492581
parent522fe43b9f491f52a9b7e6e8eaa73b656c7008ad (diff)
downloademacs-bb8eb35723ef08983b45382a442df90a4e48b3d3.tar.gz
emacs-bb8eb35723ef08983b45382a442df90a4e48b3d3.zip
* configure.ac (LD_SWITCH_SYSTEM_EMACS): Fix typo in previous change.
-rw-r--r--ChangeLog2
-rw-r--r--configure.ac4
2 files changed, 3 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 66c06254a44..97c307f3817 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,6 @@
12013-05-13 Paul Eggert <eggert@cs.ucla.edu> 12013-05-13 Paul Eggert <eggert@cs.ucla.edu>
2 2
3 * configure.ac (LD_SWITCH_SYSTEM_TEMACS): OpenBSD needs -fno-pie. 3 * configure.ac (LD_SWITCH_SYSTEM_TEMACS): OpenBSD needs -nopie.
4 Reported privately by Han Boetes <han@boetes.org>. 4 Reported privately by Han Boetes <han@boetes.org>.
5 5
62013-05-08 Juanma Barranquero <lekktu@gmail.com> 62013-05-08 Juanma Barranquero <lekktu@gmail.com>
diff --git a/configure.ac b/configure.ac
index 6077f35ba15..a52e25249c6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1009,7 +1009,7 @@ case "$opsys" in
1009 ;; 1009 ;;
1010 1010
1011 openbsd) 1011 openbsd)
1012 ## Han Boetes <han@mijncomputer.nl> says this is necessary, 1012 ## Han Boetes <han@boetes.org> says this is necessary,
1013 ## otherwise Emacs dumps core on elf systems. 1013 ## otherwise Emacs dumps core on elf systems.
1014 LD_SWITCH_SYSTEM="-Z" 1014 LD_SWITCH_SYSTEM="-Z"
1015 ;; 1015 ;;
@@ -4273,7 +4273,7 @@ case "$opsys" in
4273 ## It seems clearer therefore to put this piece in LD_SWITCH_SYSTEM_TEMACS. 4273 ## It seems clearer therefore to put this piece in LD_SWITCH_SYSTEM_TEMACS.
4274 gnu*) LD_SWITCH_SYSTEM_TEMACS="\$(LD_SWITCH_X_SITE_RPATH)" ;; 4274 gnu*) LD_SWITCH_SYSTEM_TEMACS="\$(LD_SWITCH_X_SITE_RPATH)" ;;
4275 4275
4276 openbsd) LD_SWITCH_SYSTEM_TEMACS='-fno-pie' ;; 4276 openbsd) LD_SWITCH_SYSTEM_TEMACS='-nopie' ;;
4277 4277
4278 *) LD_SWITCH_SYSTEM_TEMACS= ;; 4278 *) LD_SWITCH_SYSTEM_TEMACS= ;;
4279esac 4279esac