Mercurial > emacs
changeset 110476:c25bd24799eb
Fix the MSDOS build (broken by revno 101511).
sed1v2.inp (LINKER): Don't edit, variable was removed from src/Makefile.in.
(LD_FIRSTFLAG): Edit to empty.
| author | Eli Zaretskii <eliz@gnu.org> |
|---|---|
| date | Wed, 22 Sep 2010 11:45:26 +0200 |
| parents | ab3a38ccb842 |
| children | f97b4d2abce9 |
| files | msdos/ChangeLog msdos/sed1v2.inp |
| diffstat | 2 files changed, 7 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/msdos/ChangeLog Wed Sep 22 06:01:22 2010 +0000 +++ b/msdos/ChangeLog Wed Sep 22 11:45:26 2010 +0200 @@ -1,3 +1,9 @@ +2010-09-22 Eli Zaretskii <eliz@gnu.org> + + * sed1v2.inp (LINKER): Don't edit, variable was removed from + src/Makefile.in. + (LD_FIRSTFLAG): Edit to empty. + 2010-09-17 Eli Zaretskii <eliz@gnu.org> * sed1v2.inp (LIBXML2_LIBS, LIBXML2_CFLAGS): Edit to empty.
--- a/msdos/sed1v2.inp Wed Sep 22 06:01:22 2010 +0000 +++ b/msdos/sed1v2.inp Wed Sep 22 11:45:26 2010 +0200 @@ -31,6 +31,7 @@ /^ALL_CFLAGS *=/s/@[^@\n]*@//g /^CPPFLAGS *=/s/@[^@\n]*@// /^LDFLAGS *=/s/@[^@\n]*@// +/^LD_FIRSTFLAG *=/s/@[^@\n]*@// /^LIBS *=/s/@[^@\n]*@// /^LIBES *=/,/^ *$/ { s/@[^@\n]*@//g @@ -51,7 +52,6 @@ /^TEMACS_LDFLAGS2 *=/s/@TEMACS_LDFLAGS2@/$(LDFLAGS)/ /^LIBS_SYSTEM *=/s/@LIBS_SYSTEM@// /^LIB_GCC *=/s/@LIB_GCC@// -/^LD *=/s/@LINKER@/$(CC)/ /^LIB_STANDARD *=/s/@LIB_STANDARD@// /^LIB_MATH *=/s/@LIB_MATH@/-lm/ /^LIBTIFF *=/s/@LIBTIFF@//