From d20fb44510eb361bdc1f4551857e46324d3f2121 Mon Sep 17 00:00:00 2001
From: Steve Chamberlain <sac@cygnus>
Date: Sat, 1 Feb 1992 00:50:35 +0000
Subject: A change to the makefile got lost; ldmain. forgot that it should set
 DEFAULT_EMULATION, so ld didn't know who it was.

---
 ld/Makefile.in | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

(limited to 'ld')

diff --git a/ld/Makefile.in b/ld/Makefile.in
index ada503b..c4ff521 100644
--- a/ld/Makefile.in
+++ b/ld/Makefile.in
@@ -199,6 +199,9 @@ ldgram.h ldgram.c: ldgram.y
 	mv -f y.tab.c ldgram.c
 	mv -f y.tab.h ldgram.h
 
+ldmain.o: ldmain.c
+	$(CC) $(CFLAGS) -DDEFAULT_EMULATION=$(EMUL) -c $<
+
 ldlex.c: ldlex.l
 	/lib/cpp -E -P $(INCLUDES)  $(HDEFINES) $(TDEFINES) $(CDEFINES) $(VPATH)/ldlex.l >ldlex.p
 	lex -t ldlex.p >ldlex.q
@@ -268,19 +271,19 @@ $(LD_PROG): $(OFILES) $(BFDLIB) $(LIBIBERTY)
 
 
 ld1: ld.new
-	$(HOSTING_EMU); ./ld.new -o ld1 $(HOSTING_CRT0) $(OFILES) $(BFDLIB) $(LIBIBERTY) $(HOSTING_LIBS)
+	$(HOSTING_EMU); ./ld.new -o foo.o -r $(OFILES)
+	$(HOSTING_EMU); ./ld.new -o ld1 $(HOSTING_CRT0) foo.o $(BFDLIB) $(LIBIBERTY) $(HOSTING_LIBS)
 
-ld2: ld1
-	#try and make life a bit harder
-	$(HOSTING_EMU); ./ld1 -o foo.o -r $(OFILES)
-	$(HOSTING_EMU); ./ld1 -o ld2 $(HOSTING_CRT0) foo.o $(BFDLIB) $(LIBIBERTY) $(HOSTING_LIBS)
 
-bootstrap: ld3
-	cmp ld2 ld3
+ld2: ld1
+	$(HOSTING_EMU); ./ld1 -o ld2 $(HOSTING_CRT0) $(OFILES) $(BFDLIB) $(LIBIBERTY) $(HOSTING_LIBS)
 
 ld3: ld2
 	$(HOSTING_EMU); ./ld2 -o ld3 $(HOSTING_CRT0) $(OFILES) $(BFDLIB) $(LIBIBERTY) $(HOSTING_LIBS)
 
+bootstrap: ld3
+	cmp ld2 ld3
+
 ######################################################################
 # DOCUMENTATION TARGETS
 # TeX output
-- 
cgit v1.1