diff options
| author | John Wiegley <johnw@newartisans.com> | 2016-02-15 14:10:25 -0800 |
|---|---|---|
| committer | John Wiegley <johnw@newartisans.com> | 2016-02-15 14:10:25 -0800 |
| commit | c79978fcad84052edbdb78b33f2eaa913acb7cb0 (patch) | |
| tree | 9ddbd26fff5cd824055dfcdee1241f9f44d6a155 /src/Makefile.in | |
| parent | 73e9edf8d177af9a008faf9642512042c074706a (diff) | |
| parent | dacde7ee5d37a1fe685a489c65678a8f2c2535ce (diff) | |
| download | emacs-c79978fcad84052edbdb78b33f2eaa913acb7cb0.tar.gz | |
Merge from origin/emacs-25
dacde7e * etc/AUTHORS: Update the AUTHORS file
478ca5d ; fix changelog entries
2b7d006 ; make change-history-commit
851decb * lisp/dired-aux.el: Require cl-lib. (Bug#22613)
47896c8 ; Improve commentary in insdel.c
53ca1e1 Index tilde characters in names of backup files
d97f522 Document deprecation of hi-lock-mode's 'C-x w' bindings
b55f06d ; * etc/NEWS: Use double spaces to end a sentence.
28bb214 Announce that the `C-x w' bindings are deprecated
1c98f98 Suppress GNUstep hardening
d82f24b Fix redisplay after a large insertion
85a2753 Revert "Fix gnus-group-get-new-news-this-group on group with
closed server"
e8e3db0 ; Improve merge documentation in CONTRIBUTE
5be9989 * lib-src/make-docfile.c: Include stdarg.h.
c95ebbf Extend gpm-mouse-mode's doc string and doc to point out
limitations.
Diffstat (limited to 'src/Makefile.in')
| -rw-r--r-- | src/Makefile.in | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/Makefile.in b/src/Makefile.in index 5f72076dc45..a14d36f3f80 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@ @@ -270,8 +270,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. |