From 7ad2014ac518240a5aa8c5300a3123cfca2459b1 Mon Sep 17 00:00:00 2001 From: "H.J. Lu" Date: Tue, 27 Apr 2010 16:05:54 +0000 Subject: [PATCH] Properly install gold/ld as default cross linker. gold/ 2010-04-27 H.J. Lu * Makefile.am (install-exec-local): Properly install gold as default cross linker. * Makefile.in: Regenerated. ld/ 2010-04-27 H.J. Lu * Makefile.am (install-exec-local): Properly install ld as default cross linker. * Makefile.in: Regenerated. --- gold/ChangeLog | 6 ++++++ gold/Makefile.am | 7 ++++--- gold/Makefile.in | 7 ++++--- ld/ChangeLog | 6 ++++++ ld/Makefile.am | 7 ++++--- ld/Makefile.in | 7 ++++--- 6 files changed, 28 insertions(+), 12 deletions(-) diff --git a/gold/ChangeLog b/gold/ChangeLog index 714998b76c6..979901f18f5 100644 --- a/gold/ChangeLog +++ b/gold/ChangeLog @@ -1,3 +1,9 @@ +2010-04-27 H.J. Lu + + * Makefile.am (install-exec-local): Properly install gold as + default cross linker. + * Makefile.in: Regenerated. + 2010-04-27 H.J. Lu Nick Clifton diff --git a/gold/Makefile.am b/gold/Makefile.am index a24e185669a..df5e66c6b54 100644 --- a/gold/Makefile.am +++ b/gold/Makefile.am @@ -186,9 +186,10 @@ install-exec-local: ld-new$(EXEEXT) || $(INSTALL_PROGRAM) ld-new$(EXEEXT) $(DESTDIR)$(tooldir)/bin/$(installed_linker)$(EXEEXT); \ fi; \ if test "x$(install_as_default)" = "xyes"; then \ - rm -f $(DESTDIR)$(bindir)/ld$(EXEEXT); \ - ln $(DESTDIR)$(bindir)/$${n}$(EXEEXT) $(DESTDIR)$(bindir)/ld$(EXEEXT) >/dev/null 2>/dev/null \ - || $(INSTALL_PROGRAM) ld-new$(EXEEXT) $(DESTDIR)$(bindir)/ld$(EXEEXT); \ + ld=`echo ld | sed '$(transform)'`; \ + rm -f $(DESTDIR)$(bindir)/$${ld}$(EXEEXT); \ + ln $(DESTDIR)$(bindir)/$${n}$(EXEEXT) $(DESTDIR)$(bindir)/$${ld}$(EXEEXT) >/dev/null 2>/dev/null \ + || $(INSTALL_PROGRAM) ld-new$(EXEEXT) $(DESTDIR)$(bindir)/$${ld}$(EXEEXT); \ if test "$(bindir)" != "$(tooldir)/bin"; then \ rm -f $(DESTDIR)$(tooldir)/bin/ld$(EXEEXT); \ ln $(DESTDIR)$(bindir)/$${n}$(EXEEXT) $(DESTDIR)$(tooldir)/bin/ld$(EXEEXT) >/dev/null 2>/dev/null \ diff --git a/gold/Makefile.in b/gold/Makefile.in index 13c71cac96d..2fc2eca1f20 100644 --- a/gold/Makefile.in +++ b/gold/Makefile.in @@ -1012,9 +1012,10 @@ install-exec-local: ld-new$(EXEEXT) || $(INSTALL_PROGRAM) ld-new$(EXEEXT) $(DESTDIR)$(tooldir)/bin/$(installed_linker)$(EXEEXT); \ fi; \ if test "x$(install_as_default)" = "xyes"; then \ - rm -f $(DESTDIR)$(bindir)/ld$(EXEEXT); \ - ln $(DESTDIR)$(bindir)/$${n}$(EXEEXT) $(DESTDIR)$(bindir)/ld$(EXEEXT) >/dev/null 2>/dev/null \ - || $(INSTALL_PROGRAM) ld-new$(EXEEXT) $(DESTDIR)$(bindir)/ld$(EXEEXT); \ + ld=`echo ld | sed '$(transform)'`; \ + rm -f $(DESTDIR)$(bindir)/$${ld}$(EXEEXT); \ + ln $(DESTDIR)$(bindir)/$${n}$(EXEEXT) $(DESTDIR)$(bindir)/$${ld}$(EXEEXT) >/dev/null 2>/dev/null \ + || $(INSTALL_PROGRAM) ld-new$(EXEEXT) $(DESTDIR)$(bindir)/$${ld}$(EXEEXT); \ if test "$(bindir)" != "$(tooldir)/bin"; then \ rm -f $(DESTDIR)$(tooldir)/bin/ld$(EXEEXT); \ ln $(DESTDIR)$(bindir)/$${n}$(EXEEXT) $(DESTDIR)$(tooldir)/bin/ld$(EXEEXT) >/dev/null 2>/dev/null \ diff --git a/ld/ChangeLog b/ld/ChangeLog index 36559b2e51c..ad61f059139 100644 --- a/ld/ChangeLog +++ b/ld/ChangeLog @@ -1,3 +1,9 @@ +2010-04-27 H.J. Lu + + * Makefile.am (install-exec-local): Properly install ld as + default cross linker. + * Makefile.in: Regenerated. + 2010-04-27 H.J. Lu Nick Clifton diff --git a/ld/Makefile.am b/ld/Makefile.am index 91349719a64..3896fdadb89 100644 --- a/ld/Makefile.am +++ b/ld/Makefile.am @@ -2004,9 +2004,10 @@ install-exec-local: ld-new$(EXEEXT) install-binPROGRAMS || $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) ld-new$(EXEEXT) $(DESTDIR)$(tooldir)/bin/$(installed_linker)$(EXEEXT); \ fi; \ if test "x$(install_as_default)" = "xyes"; then \ - rm -f $(DESTDIR)$(bindir)/ld$(EXEEXT); \ - ln $(DESTDIR)$(bindir)/$$n$(EXEEXT) $(DESTDIR)$(bindir)/ld$(EXEEXT) >/dev/null 2>/dev/null \ - || $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) ld-new$(EXEEXT) $(DESTDIR)$(bindir)/ld$(EXEEXT); \ + ld=`echo ld | sed '$(transform)'`; \ + rm -f $(DESTDIR)$(bindir)/$$ld$(EXEEXT); \ + ln $(DESTDIR)$(bindir)/$$n$(EXEEXT) $(DESTDIR)$(bindir)/$$ld$(EXEEXT) >/dev/null 2>/dev/null \ + || $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) ld-new$(EXEEXT) $(DESTDIR)$(bindir)/$$ld$(EXEEXT); \ if test "$(bindir)" != "$(tooldir)/bin"; then \ rm -f $(DESTDIR)$(tooldir)/bin/ld$(EXEEXT); \ ln $(DESTDIR)$(bindir)/$$n$(EXEEXT) $(DESTDIR)$(tooldir)/bin/ld$(EXEEXT) >/dev/null 2>/dev/null \ diff --git a/ld/Makefile.in b/ld/Makefile.in index 3b53c905bdf..4c2f2bf2721 100644 --- a/ld/Makefile.in +++ b/ld/Makefile.in @@ -3331,9 +3331,10 @@ install-exec-local: ld-new$(EXEEXT) install-binPROGRAMS || $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) ld-new$(EXEEXT) $(DESTDIR)$(tooldir)/bin/$(installed_linker)$(EXEEXT); \ fi; \ if test "x$(install_as_default)" = "xyes"; then \ - rm -f $(DESTDIR)$(bindir)/ld$(EXEEXT); \ - ln $(DESTDIR)$(bindir)/$$n$(EXEEXT) $(DESTDIR)$(bindir)/ld$(EXEEXT) >/dev/null 2>/dev/null \ - || $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) ld-new$(EXEEXT) $(DESTDIR)$(bindir)/ld$(EXEEXT); \ + ld=`echo ld | sed '$(transform)'`; \ + rm -f $(DESTDIR)$(bindir)/$$ld$(EXEEXT); \ + ln $(DESTDIR)$(bindir)/$$n$(EXEEXT) $(DESTDIR)$(bindir)/$$ld$(EXEEXT) >/dev/null 2>/dev/null \ + || $(LIBTOOL) --mode=install $(INSTALL_PROGRAM) ld-new$(EXEEXT) $(DESTDIR)$(bindir)/$$ld$(EXEEXT); \ if test "$(bindir)" != "$(tooldir)/bin"; then \ rm -f $(DESTDIR)$(tooldir)/bin/ld$(EXEEXT); \ ln $(DESTDIR)$(bindir)/$$n$(EXEEXT) $(DESTDIR)$(tooldir)/bin/ld$(EXEEXT) >/dev/null 2>/dev/null \ -- 2.30.2