diff options
| author | Richard Biener <rguenther@suse.de> | 2014-04-02 07:52:36 +0000 |
|---|---|---|
| committer | Richard Biener <rguenth@gcc.gnu.org> | 2014-04-02 07:52:36 +0000 |
| commit | a1ce39befeec73a658a8644751cbd1793c319c7e (patch) | |
| tree | 073af844f443a88c963820127b682885e632cfea | |
| parent | d1c5eca12fbb8855773fa01a512e6da5e841effe (diff) | |
| download | gcc-a1ce39befeec73a658a8644751cbd1793c319c7e.zip gcc-a1ce39befeec73a658a8644751cbd1793c319c7e.tar.gz gcc-a1ce39befeec73a658a8644751cbd1793c319c7e.tar.bz2 | |
re PR bootstrap/60719 (With --program-prefix=$target_alias --program-suffix=-$version install-driver breaks)
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
| -rw-r--r-- | gcc/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/Makefile.in | 11 |
2 files changed, 13 insertions, 4 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 4fdfe921..8a4de86 100644 --- 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 30a717e..8cdee22 100644 --- 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) && \ |