summaryrefslogtreecommitdiff
path: root/msdos
diff options
context:
space:
mode:
authorGlenn Morris <rgm@gnu.org>2010-05-18 19:42:04 -0700
committerGlenn Morris <rgm@gnu.org>2010-05-18 19:42:04 -0700
commitc1d0dcfd127b3f9742c31f794e2a6d886048bb1e (patch)
tree1d070669e258b1bc4ea5507fb58149ca1d6ee685 /msdos
parent7f34aec377794208fb4aecda44c49ff9f11e7d86 (diff)
downloademacs-c1d0dcfd127b3f9742c31f794e2a6d886048bb1e.tar.gz
Set linker-related things with configure.
* configure.in (LINKER, YMF_PASS_LDFLAGS): New output variables. (ORDINARY_LINK): New AC_DEFINE. (LIB_GCC): No need to set if ORDINARY_LINK. * src/Makefile.in (LD, YMF_PASS_LDFLAGS): Set with configure, not cpp. (GNULIB_VAR): Remove. (LIBES): Use LIB_GCC instead of GNULIB_VAR. * src/m/ibms390x.h (LINKER): * src/m/macppc.h (LINKER) [GNU_LINUX]: * src/s/aix4-2.h (ORDINARY_LINK): * src/s/cygwin.h (LINKER): * src/s/darwin.h (ORDINARY_LINK): * src/s/gnu.h (ORDINARY_LINK): * src/s/netbsd.h (LINKER): * src/s/usg5-4.h (ORDINARY_LINK): Move to configure. * msdos/sed1v2.inp (LD): Edit to $(CC). (YMF_PASS_LDFLAGS): Edit to `flags'.
Diffstat (limited to 'msdos')
-rw-r--r--msdos/ChangeLog5
-rw-r--r--msdos/sed1v2.inp2
2 files changed, 7 insertions, 0 deletions
diff --git a/msdos/ChangeLog b/msdos/ChangeLog
index fd320d85920..cbc018dffe6 100644
--- a/msdos/ChangeLog
+++ b/msdos/ChangeLog
@@ -1,3 +1,8 @@
+2010-05-19 Glenn Morris <rgm@gnu.org>
+
+ * sed1v2.inp (LD): Edit to $(CC).
+ (YMF_PASS_LDFLAGS): Edit to `flags'.
+
2010-05-18 Eli Zaretskii <eliz@gnu.org>
* sed1x.inp: Add copyright notice.
diff --git a/msdos/sed1v2.inp b/msdos/sed1v2.inp
index 574910d2beb..7b9b77309df 100644
--- a/msdos/sed1v2.inp
+++ b/msdos/sed1v2.inp
@@ -55,6 +55,7 @@ s/\.h\.in/.h-in/
/^TEMACS_LDFLAGS2 *=/s/@TEMACS_LDFLAGS2@/$(LDFLAGS)/
/^LIBS_SYSTEM *=/s/@LIBS_SYSTEM@//
/^LIB_GCC *=/s/@LIB_GCC@/-Lgcc/
+/^LD *=/s/@LINKER@/$(CC)/
/^LIB_STANDARD *=/s/@LIB_STANDARD@//
/^LIB_MATH *=/s/@LIB_MATH@/-lm/
/^LIBTIFF *=/s/@LIBTIFF@//
@@ -143,6 +144,7 @@ s/\.h\.in/.h-in/
/^ @: /d
/^ -\{0,1\}ln -/s/ln -f/cp -pf/
/^[ ]touch /s/touch/djecho $@ >/
+s/@YMF_PASS_LDFLAGS@/flags/
s/bootstrap-emacs/b-emacs/
s/bootstrap-temacs/b-temacs/
s/bootstrap-doc/b-doc/