OSDN Git Service

2012-03-05 Ralf Cors├ępius <ralf.corsepius@rtems.org>
authorcorsepiu <corsepiu@138bc75d-0d04-0410-961f-82ee72b054a4>
Wed, 7 Mar 2012 10:59:56 +0000 (10:59 +0000)
committercorsepiu <corsepiu@138bc75d-0d04-0410-961f-82ee72b054a4>
Wed, 7 Mar 2012 10:59:56 +0000 (10:59 +0000)
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.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-4_7-branch@185034 138bc75d-0d04-0410-961f-82ee72b054a4

gcc/ChangeLog
gcc/Makefile.in

index 10f9152..a316ec3 100644 (file)
@@ -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-06  Aldy Hernandez  <aldyh@redhat.com>
 
        * trans-mem.c: New typedef for tm_region_p.
index f6cf8ff..2319cab 100644 (file)
@@ -4811,20 +4811,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