Mercurial > emacs
comparison configure.in @ 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 | d38bcb4008ab |
comparison
equal
deleted
inserted
replaced
| 108791:737446e13a3f | 108792:939ecb6ccd4d |
|---|---|
| 3333 macppc|ibms390x) LINKER="\$(CC) -nostdlib" ;; | 3333 macppc|ibms390x) LINKER="\$(CC) -nostdlib" ;; |
| 3334 esac | 3334 esac |
| 3335 ;; | 3335 ;; |
| 3336 esac | 3336 esac |
| 3337 | 3337 |
| 3338 ## A macro which other sections of Makefile can redefine to munge the | 3338 |
| 3339 ## flags before they are passed to LD. This is helpful if you have | 3339 PRE_EDIT_LDFLAGS= |
| 3340 ## redefined LD to something odd, like "gcc". | 3340 POST_EDIT_LDFLAGS= |
| 3341 ## (The YMF prefix is a holdover from the old name "ymakefile".) | |
| 3342 YMF_PASS_LDFLAGS=flags | |
| 3343 if test "x$ORDINARY_LINK" = "xyes"; then | 3341 if test "x$ORDINARY_LINK" = "xyes"; then |
| 3344 | 3342 |
| 3345 LINKER="\$(CC)" | 3343 LINKER="\$(CC)" |
| 3346 AC_DEFINE(ORDINARY_LINK, 1, [Define if the C compiler is the linker.]) | 3344 AC_DEFINE(ORDINARY_LINK, 1, [Define if the C compiler is the linker.]) |
| 3347 | 3345 |
| 3361 ## GCC passes any argument prefixed with -Xlinker directly to the linker. | 3359 ## GCC passes any argument prefixed with -Xlinker directly to the linker. |
| 3362 ## See prefix-args.c for an explanation of why we do not do this with the | 3360 ## See prefix-args.c for an explanation of why we do not do this with the |
| 3363 ## shell''s ``for'' construct. Note that sane people do not have '.' in | 3361 ## shell''s ``for'' construct. Note that sane people do not have '.' in |
| 3364 ## their paths, so we must use ./prefix-args. | 3362 ## their paths, so we must use ./prefix-args. |
| 3365 ## TODO either make prefix-args check ORDINARY_LINK internally, | 3363 ## TODO either make prefix-args check ORDINARY_LINK internally, |
| 3366 ## or remove it altogether (bug#6184), removing the need for this macro. | 3364 ## or remove it altogether (bug#6184), removing the need for this hack. |
| 3367 YMF_PASS_LDFLAGS='`./prefix-args -Xlinker flags`' | 3365 PRE_EDIT_LDFLAGS='`./prefix-args -Xlinker' |
| 3368 fi | 3366 POST_EDIT_LDFLAGS='`' |
| 3369 AC_SUBST(YMF_PASS_LDFLAGS) | 3367 fi |
| 3368 AC_SUBST(PRE_EDIT_LDFLAGS) | |
| 3369 AC_SUBST(POST_EDIT_LDFLAGS) | |
| 3370 | 3370 |
| 3371 test "x$LINKER" = "x" && LINKER=ld | 3371 test "x$LINKER" = "x" && LINKER=ld |
| 3372 ## FIXME? What setting of YMF_PASS_LDFLAGS should this have? | 3372 ## FIXME? What setting of YMF_PASS_LDFLAGS should this have? |
| 3373 test "$NS_IMPL_GNUSTEP" = "yes" && LINKER="\$(CC) -rdynamic" | 3373 test "$NS_IMPL_GNUSTEP" = "yes" && LINKER="\$(CC) -rdynamic" |
| 3374 | 3374 |