summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Eggert <eggert@cs.ucla.edu>2016-02-12 16:23:25 -0800
committerPaul Eggert <eggert@cs.ucla.edu>2016-02-12 16:24:04 -0800
commit1c98f989911442e552f597c74606a220f9315ae8 (patch)
treebe280e8110b29e9dad76538f484d0f7271f74e8f
parentd82f24ba8530eb8de04a319cc80742a0a953040e (diff)
downloademacs-1c98f989911442e552f597c74606a220f9315ae8.tar.gz
Suppress GNUstep hardening
Fedora 23 normally hardens GNUstep applications, which causes ‘./configure --with-ns’ to break Emacs’s funky way of undumping. Fix this by eliding the hardening options (Bug#22518). * src/Makefile.in (LIBS_GNUSTEP): Omit options like ‘-specs=/usr/lib/rpm/redhat/redhat-hardened-ld’. (GNU_OBJC_CFLAGS): Omit options like ‘-specs=/usr/lib/rpm/redhat/redhat-hardened-cc1’.
-rw-r--r--src/Makefile.in8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/Makefile.in b/src/Makefile.in
index f99a2f401ad..1f0df6f3ec8 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -214,8 +214,8 @@ LIBX_OTHER=@LIBX_OTHER@
## configure, which should set it to nil in non-X builds.
LIBX_BASE=$(LIBXMENU) $(LD_SWITCH_X_SITE)
-## Only used for GNUstep
-LIBS_GNUSTEP=@LIBS_GNUSTEP@
+## Used only for GNUstep.
+LIBS_GNUSTEP=$(patsubst -specs=%-hardened-ld,,@LIBS_GNUSTEP@)
LIBSOUND= @LIBSOUND@
CFLAGS_SOUND= @CFLAGS_SOUND@
@@ -268,8 +268,8 @@ MSDOS_X_OBJ =
NS_OBJ=@NS_OBJ@
## nsterm.o nsfns.o nsmenu.o nsselect.o nsimage.o ns_fontfile if HAVE_NS.
NS_OBJC_OBJ=@NS_OBJC_OBJ@
-## Only set if NS_IMPL_GNUSTEP.
-GNU_OBJC_CFLAGS=@GNU_OBJC_CFLAGS@
+## Used only for GNUstep.
+GNU_OBJC_CFLAGS=$(patsubst -specs=%-hardened-cc1,,@GNU_OBJC_CFLAGS@)
## w32fns.o w32menu.c w32reg.o fringe.o fontset.o w32font.o w32term.o
## w32xfns.o w32select.o image.o w32uniscribe.o if HAVE_W32, else
## empty.