diff options
| author | Brooks Moses <bmoses@google.com> | 2013-09-12 16:07:32 -0700 |
|---|---|---|
| committer | Brooks Moses <brooks@gcc.gnu.org> | 2013-09-12 16:07:32 -0700 |
| commit | 90ae701920bb7a9d8888f0df757a1354e1e8d70a (patch) | |
| tree | af6b2a5ed4697e45fd0e8b428f02102e25619f9c /gcc/fortran | |
| parent | c5215a9bd381d2f607c731d1a33d9784d20c2c08 (diff) | |
| download | gcc-90ae701920bb7a9d8888f0df757a1354e1e8d70a.zip gcc-90ae701920bb7a9d8888f0df757a1354e1e8d70a.tar.gz gcc-90ae701920bb7a9d8888f0df757a1354e1e8d70a.tar.bz2 | |
re PR driver/42955 (undecorated cross-compiler gcc fails to find cc1)
PR driver/42955
* Makefile.in: Do not install driver binaries in $(target)/bin.
* cp/Make-lang.in: Likewise.
* fortran/Make-lang.in: Likewise.
From-SVN: r202544
Diffstat (limited to 'gcc/fortran')
| -rw-r--r-- | gcc/fortran/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/fortran/Make-lang.in | 11 |
2 files changed, 8 insertions, 8 deletions
diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index dba8032..9695e9b 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,8 @@ +2013-09-12 Brooks Moses <bmoses@google.com> + + PR driver/42955 + * Make-lang.in: Do not install driver binaries in $(target)/bin. + 2013-09-09 Tobias Burnus <burnus@net-b.de> * invoke.texi (Error and Warning Options): Add hyphen. diff --git a/gcc/fortran/Make-lang.in b/gcc/fortran/Make-lang.in index ee70423..47deca6 100644 --- a/gcc/fortran/Make-lang.in +++ b/gcc/fortran/Make-lang.in @@ -241,19 +241,14 @@ install-finclude-dir: installdirs # Install hooks: # f951 is installed elsewhere as part of $(COMPILERS). -# Install the driver program as $(target)-gfortran -# and also as either gfortran (if native) or $(tooldir)/bin/gfortran. +# Install the driver program as $(target)-gfortran, and also as gfortran +# if native. fortran.install-common: install-finclude-dir installdirs -if [ -f f951$(exeext) ] ; then \ rm -f $(DESTDIR)$(bindir)/$(GFORTRAN_INSTALL_NAME)$(exeext); \ $(INSTALL_PROGRAM) gfortran$(exeext) $(DESTDIR)$(bindir)/$(GFORTRAN_INSTALL_NAME)$(exeext); \ chmod a+x $(DESTDIR)$(bindir)/$(GFORTRAN_INSTALL_NAME)$(exeext); \ - if [ -f gfortran-cross$(exeext) ] ; then \ - if [ -d $(DESTDIR)$(gcc_tooldir)/bin/. ] ; then \ - rm -f $(DESTDIR)$(gcc_tooldir)/bin/gfortran$(exeext); \ - $(INSTALL_PROGRAM) gfortran-cross$(exeext) $(DESTDIR)$(gcc_tooldir)/bin/gfortran$(exeext); \ - else true; fi; \ - else \ + if [ ! -f gfortran-cross$(exeext) ] ; then \ rm -f $(DESTDIR)$(bindir)/$(GFORTRAN_TARGET_INSTALL_NAME)$(exeext); \ $(LN) $(DESTDIR)$(bindir)/$(GFORTRAN_INSTALL_NAME)$(exeext) $(DESTDIR)$(bindir)/$(GFORTRAN_TARGET_INSTALL_NAME)$(exeext); \ fi ; \ |