re PR other/51417 (Cross-compiler - wrappers for ar, nm, ranlib installed under wrong...

2012-03-05  Ralf Corsépius  <ralf.corsepius@rtems.org>

	PR target/51417
	* Makefile.in: Let install-gcc-ar depend on installdirs, gcc-ar$(exeext),
	gcc-nm$(exeext), gcc-ranlib$(exeext).
	Don't double canonicalize if cross-compiling.

From-SVN: r185035

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index c8895e87e9a0cb863e1af5f0fbe394987a91ca47..9c986723e58ff576dec8b0cdc96bb4f750b12edc 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2012-03-07  Ralf Corsépius  <ralf.corsepius@rtems.org>
+
+       PR target/51417
+       * Makefile.in: Let install-gcc-ar depend on installdirs, gcc-ar$(exeext),
+       gcc-nm$(exeext), gcc-ranlib$(exeext).
+       Don't double canonicalize if cross-compiling.
+
 2012-03-07  Georg-Johann Lay  <avr@gjlay.de>
 
        PR target/52506

diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index 0b7e6351074d8c50b92066600e8b8d7d90b1ab38..6e7148f872c485206fbc8856ec39f250fc4fc266 100644 (file)
--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
@@ -4807,20 +4807,18 @@ install-collect2: collect2 installdirs
 install-lto-wrapper: lto-wrapper$(exeext)
        $(INSTALL_PROGRAM) lto-wrapper$(exeext) $(DESTDIR)$(libexecsubdir)/lto-wrapper$(exeext)
 
-install-gcc-ar:
-       set -e ; \
-       for i in ar nm ranlib ; do \
-         install_name=`echo gcc-$$i|sed '$(program_transform_name)'`$(exeext) ;\
-         target_install_name=$(target_noncanonical)-`echo gcc-$$i|sed '$(program_transform_name)'`$(exeext) ; \
-         binname=gcc-$$i$(exeext) ; \
-         rm -f $(DESTDIR)$(bindir)/$$install_name ; \
-         rm -f $(DESTDIR)$(bindir)/$$target_install_name ; \
-         $(INSTALL_PROGRAM) $$binname $(DESTDIR)$(bindir)/$$install_name ;\
-         if test -f $(DESTDIR)$(bindir)$$target_install_name ; then \
+install-gcc-ar: installdirs gcc-ar$(exeext) gcc-nm$(exeext) gcc-ranlib$(exeext)
+       for i in gcc-ar gcc-nm gcc-ranlib; do \
+         install_name=`echo $$i|sed '$(program_transform_name)'` ;\
+         target_install_name=$(target_noncanonical)-`echo $$i|sed '$(program_transform_name)'` ; \
+         rm -f $(DESTDIR)$(bindir)/$$install_name$(exeext) ; \
+         $(INSTALL_PROGRAM) $$i$(exeext) $(DESTDIR)$(bindir)/$$install_name$(exeext) ;\
+         if test -f gcc-cross$(exeext); then \
            :; \
          else \
+           rm -f $(DESTDIR)$(bindir)/$$target_install_name$(exeext); \
            ( cd $(DESTDIR)$(bindir) && \
-             $(LN) $$install_name $$target_install_name ) ; \
+             $(LN) $$install_name$(exeext) $$target_install_name$(exeext) ) ; \
          fi ; \
        done