aboutsummaryrefslogtreecommitdiff
path: root/gcc
diff options
context:
space:
mode:
authorKazu Hirata <kazu@codesourcery.com>2005-07-06 05:17:00 +0000
committerKazu Hirata <kazu@gcc.gnu.org>2005-07-06 05:17:00 +0000
commit1538fc3c3efe8163132b43fb446b15f3fb9be72c (patch)
treedc0530dfc0f7a10d24e2e96a2788f511b8672e2f /gcc
parentb65da304410d189aa76e4c5fcfe4047529a9f6d1 (diff)
downloadgcc-1538fc3c3efe8163132b43fb446b15f3fb9be72c.zip
gcc-1538fc3c3efe8163132b43fb446b15f3fb9be72c.tar.gz
gcc-1538fc3c3efe8163132b43fb446b15f3fb9be72c.tar.bz2
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
Diffstat (limited to 'gcc')
-rw-r--r--gcc/ChangeLog8
-rw-r--r--gcc/Makefile.in24
2 files changed, 24 insertions, 8 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index f78cfdb..14c4912 100644
--- 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 5efb79e..20014cb 100644
--- 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 > $@