From d59e5a4707dd884f221c84f216a29eb222a6fd04 Mon Sep 17 00:00:00 2001
From: David MacKenzie <djm@cygnus>
Date: Thu, 22 Jul 1993 00:55:56 +0000
Subject: [PATCH] move compile-in decision to genscripts.sh

---
 ld/ChangeLog            | 7 ++++++-
 ld/emultempl/hppaosf.em | 2 +-
 ld/emultempl/m88kbcs.em | 2 +-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/ld/ChangeLog b/ld/ChangeLog
index a61929d2de6..07252e9cb28 100644
--- 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 d08951de958..91ddd364f64 100644
--- 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 52682e6a02c..a1add23b589 100644
--- 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.
 
-- 
2.30.2