Makefile.in (stamp-collect-ld): Use $(ORIGINAL_LD_FOR_TARGET) instead of $<.

	* Makefile.in (stamp-collect-ld): Use
	$(ORIGINAL_LD_FOR_TARGET) instead of $<.  Don't remove
	./collect-ld if it already exists.
	(stamp-nm): Use $(ORIGINAL_NM_FOR_TARGET) instead of $<.
	Don't remove ./nm if it already exists.

From-SVN: r101651

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index f78cfdb6707a88959da4bde5ced786887dc14975..14c491245c39d43f03b645a0f6073364b9f78963 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,11 @@
+2005-07-06  Kazu Hirata  <kazu@codesourcery.com>
+
+       * Makefile.in (stamp-collect-ld): Use
+       $(ORIGINAL_LD_FOR_TARGET) instead of $<.  Don't remove
+       ./collect-ld if it already exists.
+       (stamp-nm): Use $(ORIGINAL_NM_FOR_TARGET) instead of $<.
+       Don't remove ./nm if it already exists.
+
 2005-07-05  Devang Patel  <dpatel@apple.com>
 
        * tree-vectorizer.h (struct _loop_vec_info): Remove loop_line_number.

diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index 5efb79e5e7c580c6d32ec11acb54d13400dd5eb0..20014cbaba5044652de22bc0a307377831d1bc61 100644 (file)
--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
@@ -1222,25 +1222,33 @@ stamp-as: $(ORIGINAL_AS_FOR_TARGET)
        echo timestamp > $@
 
 stamp-collect-ld: $(ORIGINAL_LD_FOR_TARGET)
-       @echo creating collect-ld; rm -f collect-ld; \
-       case "$<" in \
-         ./*) ;; \
+       @echo creating collect-ld; \
+       case "$(ORIGINAL_LD_FOR_TARGET)" in \
+         ./collect-ld) ;; \
          ../*) \
+            rm -f collect-ld$(exeext); \
             echo $(LN) $< collect-ld$(exeext); \
             $(LN) $< collect-ld$(exeext) || cp $< collect-ld$(exeext) ;; \
-         *) echo '#!$(SHELL)' > collect-ld; echo 'exec $< "$$@"' >> collect-ld ; \
+         *) \
+            rm -f collect-ld$(exeext); \
+            echo '#!$(SHELL)' > collect-ld; \
+            echo 'exec $(ORIGINAL_LD_FOR_TARGET) "$$@"' >> collect-ld ; \
             chmod +x collect-ld ;; \
        esac
        echo timestamp > $@
 
 stamp-nm: $(ORIGINAL_NM_FOR_TARGET)
-       @echo creating nm; rm -f nm; \
-       case "$<" in \
-         ./*) ;; \
+       @echo creating nm; \
+       case "$(ORIGINAL_NM_FOR_TARGET)" in \
+         ./nm) ;; \
          ../*) \
+            rm -f nm$(exeext); \
             echo $(LN) $< nm$(exeext); \
             $(LN) $< nm$(exeext) || cp $< nm$(exeext) ;; \
-         *) echo '#!$(SHELL)' > nm; echo 'exec $< "$$@"' >> nm ; \
+         *) \
+            rm -f nm$(exeext); \
+            echo '#!$(SHELL)' > nm; \
+            echo 'exec $(ORIGINAL_NM_FOR_TARGET) "$$@"' >> nm ; \
             chmod +x nm ;; \
        esac
        echo timestamp > $@