move compile-in decision to genscripts.sh

diff --git a/ld/ChangeLog b/ld/ChangeLog
index a61929d2de69b280c5d10acfbeb471ba63513ab2..07252e9cb2880d1042581da4057ab9e6638f21bf 100644 (file)
--- a/ld/ChangeLog
+++ b/ld/ChangeLog
@@ -1,10 +1,15 @@
 Wed Jul 21 14:28:42 1993  David J. Mackenzie  (djm@thepub.cygnus.com)
 
+       * genscripts.sh: If this is the default emulation, set
+       COMPILE_IN.
+       * emultempl/*.em: Use it to determine whether to compile in the
+       scripts.
+
        * Makefile.in (GENSCRIPTS): Pass the default emulation name to
        genscripts.sh.  Pass the current emulation name without ".sh" on
        the end.
        * genscripts.sh: Take an default emulation arg.
-       Use the emulparams file name as EMULATION_NAME.
+       Use the current emulation name as EMULATION_NAME.
        Make default lib path for cross-compiling ':', not null.
        * emulparams/*.sh: Don't set EMULATION_NAME.
        * ldemul.c (ldemul_get_script): Take isfile arg.

diff --git a/ld/emultempl/hppaosf.em b/ld/emultempl/hppaosf.em
index d08951de958dc7cc6fc417fff3fe32d2be50d226..91ddd364f64a40663726356b3bb5f4ce8be539aa 100644 (file)
--- a/ld/emultempl/hppaosf.em
+++ b/ld/emultempl/hppaosf.em
@@ -86,7 +86,7 @@ hppaosf_get_script(isfile)
      int *isfile;
 EOF
 
-if test "$DEFAULT_EMULATION" = "$EMULATION_NAME"
+if test -n "$COMPILE_IN"
 then
 # Scripts compiled in.
 

diff --git a/ld/emultempl/m88kbcs.em b/ld/emultempl/m88kbcs.em
index 52682e6a02c59ab2f20eeb286d8b863ebfca7a99..a1add23b589cb9cd8a2d9f41055a473c0849d261 100644 (file)
--- a/ld/emultempl/m88kbcs.em
+++ b/ld/emultempl/m88kbcs.em
@@ -53,7 +53,7 @@ gld${EMULATION_NAME}_get_script(isfile)
      int *isfile;
 EOF
 
-if test "$DEFAULT_EMULATION" = "$EMULATION_NAME"
+if test -n "$COMPILE_IN"
 then
 # Scripts compiled in.