Mercurial > emacs
comparison configure @ 108792:939ecb6ccd4d
Replace YMF_PASS_LDFLAGS with autoconf.
* configure.in (YMF_PASS_LDFLAGS): Remove.
(PRE_EDIT_LDFLAGS, POST_EDIT_LDFLAGS): New output variables.
* configure: Regenerate.
* src/Makefile.in (YMF_PASS_LDFLAGS): Remove.
(temacs${EXEEXT}): Use PRE_EDIT_LDFLAGS, POST_EDIT_LDFLAGS.
* msdos/sed1v2.inp (@PRE_EDIT_LDFLAGS@, @POST_EDIT_LDFLAGS@): Edit to nothing.
author | Glenn Morris <rgm@gnu.org> |
---|---|
date | Tue, 25 May 2010 23:41:58 -0700 |
parents | 1b3be6d705bd |
children | dedcf813aa69 |
comparison
equal
deleted
inserted
replaced
108791:737446e13a3f | 108792:939ecb6ccd4d |
---|---|
816 RALLOC_OBJ | 816 RALLOC_OBJ |
817 CYGWIN_OBJ | 817 CYGWIN_OBJ |
818 PRE_ALLOC_OBJ | 818 PRE_ALLOC_OBJ |
819 POST_ALLOC_OBJ | 819 POST_ALLOC_OBJ |
820 LD_SWITCH_SYSTEM_TEMACS | 820 LD_SWITCH_SYSTEM_TEMACS |
821 YMF_PASS_LDFLAGS | 821 PRE_EDIT_LDFLAGS |
822 POST_EDIT_LDFLAGS | |
822 LINKER | 823 LINKER |
823 LIB_GCC | 824 LIB_GCC |
824 MOUSE_SUPPORT | 825 MOUSE_SUPPORT |
825 TOOLTIP_SUPPORT | 826 TOOLTIP_SUPPORT |
826 WINDOW_SUPPORT | 827 WINDOW_SUPPORT |
26653 macppc|ibms390x) LINKER="\$(CC) -nostdlib" ;; | 26654 macppc|ibms390x) LINKER="\$(CC) -nostdlib" ;; |
26654 esac | 26655 esac |
26655 ;; | 26656 ;; |
26656 esac | 26657 esac |
26657 | 26658 |
26658 ## A macro which other sections of Makefile can redefine to munge the | 26659 |
26659 ## flags before they are passed to LD. This is helpful if you have | 26660 PRE_EDIT_LDFLAGS= |
26660 ## redefined LD to something odd, like "gcc". | 26661 POST_EDIT_LDFLAGS= |
26661 ## (The YMF prefix is a holdover from the old name "ymakefile".) | |
26662 YMF_PASS_LDFLAGS=flags | |
26663 if test "x$ORDINARY_LINK" = "xyes"; then | 26662 if test "x$ORDINARY_LINK" = "xyes"; then |
26664 | 26663 |
26665 LINKER="\$(CC)" | 26664 LINKER="\$(CC)" |
26666 | 26665 |
26667 cat >>confdefs.h <<\_ACEOF | 26666 cat >>confdefs.h <<\_ACEOF |
26685 ## GCC passes any argument prefixed with -Xlinker directly to the linker. | 26684 ## GCC passes any argument prefixed with -Xlinker directly to the linker. |
26686 ## See prefix-args.c for an explanation of why we do not do this with the | 26685 ## See prefix-args.c for an explanation of why we do not do this with the |
26687 ## shell''s ``for'' construct. Note that sane people do not have '.' in | 26686 ## shell''s ``for'' construct. Note that sane people do not have '.' in |
26688 ## their paths, so we must use ./prefix-args. | 26687 ## their paths, so we must use ./prefix-args. |
26689 ## TODO either make prefix-args check ORDINARY_LINK internally, | 26688 ## TODO either make prefix-args check ORDINARY_LINK internally, |
26690 ## or remove it altogether (bug#6184), removing the need for this macro. | 26689 ## or remove it altogether (bug#6184), removing the need for this hack. |
26691 YMF_PASS_LDFLAGS='`./prefix-args -Xlinker flags`' | 26690 PRE_EDIT_LDFLAGS='`./prefix-args -Xlinker' |
26692 fi | 26691 POST_EDIT_LDFLAGS='`' |
26692 fi | |
26693 | |
26693 | 26694 |
26694 | 26695 |
26695 test "x$LINKER" = "x" && LINKER=ld | 26696 test "x$LINKER" = "x" && LINKER=ld |
26696 ## FIXME? What setting of YMF_PASS_LDFLAGS should this have? | 26697 ## FIXME? What setting of YMF_PASS_LDFLAGS should this have? |
26697 test "$NS_IMPL_GNUSTEP" = "yes" && LINKER="\$(CC) -rdynamic" | 26698 test "$NS_IMPL_GNUSTEP" = "yes" && LINKER="\$(CC) -rdynamic" |