re PR bootstrap/60719 (With --program-prefix=$target_alias --program-suffix=-$version...

2014-04-02  Richard Biener  <rguenther@suse.de>

	PR bootstrap/60719
	* Makefile.in (install-driver): Guard extra installs with special
	names properly.

From-SVN: r209010

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 4fdfe921cdc0beb4474759ad54e15eb0f3a5deba..8a4de8639ac2a72c2f11a6f660d62be43be3ed7f 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2014-04-02  Richard Biener  <rguenther@suse.de>
+
+       PR bootstrap/60719
+       * Makefile.in (install-driver): Guard extra installs with special
+       names properly.
+
 2014-04-01  Michael Meissner  <meissner@linux.vnet.ibm.com>
 
        * doc/extend.texi (PowerPC AltiVec/VSX Built-in Functions):

diff --git a/gcc/Makefile.in b/gcc/Makefile.in
index 30a717e73f9c1cb5a69e442f95085a5e78d7c52b..8cdee22d5a63b1d10282bd64cef4ba349cfffa1f 100644 (file)
--- a/gcc/Makefile.in
+++ b/gcc/Makefile.in
@@ -3205,10 +3205,13 @@ install-common: native lang.install-common installdirs
 install-driver: installdirs xgcc$(exeext)
        -rm -f $(DESTDIR)$(bindir)/$(GCC_INSTALL_NAME)$(exeext)
        -$(INSTALL_PROGRAM) xgcc$(exeext) $(DESTDIR)$(bindir)/$(GCC_INSTALL_NAME)$(exeext)
-       -rm -f $(DESTDIR)$(bindir)/$(target_noncanonical)-gcc-$(version)$(exeext)
-       -( cd $(DESTDIR)$(bindir) && \
-          $(LN) $(GCC_INSTALL_NAME)$(exeext) $(target_noncanonical)-gcc-$(version)$(exeext) )
-       -if [ ! -f gcc-cross$(exeext) ] ; then \
+       -if [ "$(GCC_INSTALL_NAME)" != "$(target_noncanonical)-gcc-$(version)" ]; then \
+         -rm -f $(DESTDIR)$(bindir)/$(target_noncanonical)-gcc-$(version)$(exeext) \
+         -( cd $(DESTDIR)$(bindir) && \
+            $(LN) $(GCC_INSTALL_NAME)$(exeext) $(target_noncanonical)-gcc-$(version)$(exeext) ) \
+       fi
+       -if [ ! -f gcc-cross$(exeext) ] \
+           && [ "$(GCC_INSTALL_NAME)" != "$(GCC_TARGET_INSTALL_NAME)" ]; then \
          rm -f $(DESTDIR)$(bindir)/$(target_noncanonical)-gcc-tmp$(exeext); \
          ( cd $(DESTDIR)$(bindir) && \
            $(LN) $(GCC_INSTALL_NAME)$(exeext) $(target_noncanonical)-gcc-tmp$(exeext) && \