From: Brooks Moses Date: Thu, 12 Sep 2013 23:07:32 +0000 (-0700) Subject: re PR driver/42955 (undecorated cross-compiler gcc fails to find cc1) X-Git-Tag: releases/gcc-4.9.0~4096 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=90ae701920bb7a9d8888f0df757a1354e1e8d70a;p=thirdparty%2Fgcc.git 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 --- diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 26bcf8d09054..bc0e73022f6b 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2013-09-12 Brooks Moses + + PR driver/42955 + * Makefile.in: Do not install driver binaries in $(target)/bin. + 2013-09-12 DJ Delorie * config/rl78/rl78.opt (mrelax): New. diff --git a/gcc/Makefile.in b/gcc/Makefile.in index b02d61d3d04f..a2e3f7af2bae 100644 --- a/gcc/Makefile.in +++ b/gcc/Makefile.in @@ -4771,20 +4771,14 @@ install-common: native lang.install-common installdirs fi # Install the driver program as $(target_noncanonical)-gcc, -# $(target_noncanonical)-gcc-$(version) -# and also as either gcc (if native) or $(gcc_tooldir)/bin/gcc. +# $(target_noncanonical)-gcc-$(version), and also as gcc if native. 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 [ -d $(DESTDIR)$(gcc_tooldir)/bin/. ] ; then \ - rm -f $(DESTDIR)$(gcc_tooldir)/bin/gcc$(exeext); \ - $(INSTALL_PROGRAM) gcc-cross$(exeext) $(DESTDIR)$(gcc_tooldir)/bin/gcc$(exeext); \ - else true; fi; \ - else \ + -if [ ! -f gcc-cross$(exeext) ] ; then \ rm -f $(DESTDIR)$(bindir)/$(target_noncanonical)-gcc-tmp$(exeext); \ ( cd $(DESTDIR)$(bindir) && \ $(LN) $(GCC_INSTALL_NAME)$(exeext) $(target_noncanonical)-gcc-tmp$(exeext) && \ diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 470fa1f22d85..68c8ea4beb3e 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,8 @@ +2013-09-12 Brooks Moses + + PR driver/42955 + * Make-lang.in: Do not install driver binaries in $(target)/bin. + 2013-09-12 Adam Butcher * cp-tree.h (type_uses_auto_or_concept): Declare. diff --git a/gcc/cp/Make-lang.in b/gcc/cp/Make-lang.in index e8d4913fbd19..985f22b72d9d 100644 --- a/gcc/cp/Make-lang.in +++ b/gcc/cp/Make-lang.in @@ -167,8 +167,8 @@ check_g++_parallelize = old-deja.exp dg.exp dg-torture.exp # Install hooks: # cc1plus is installed elsewhere as part of $(COMPILERS). -# Install the driver program as $(target)-g++ -# and also as either g++ (if native) or $(tooldir)/bin/g++. +# Install the driver program as $(target)-g++ and $(target)-c++, and +# also as g++ and c++ if native. c++.install-common: installdirs -rm -f $(DESTDIR)$(bindir)/$(GXX_INSTALL_NAME)$(exeext) -$(INSTALL_PROGRAM) xg++$(exeext) $(DESTDIR)$(bindir)/$(GXX_INSTALL_NAME)$(exeext) @@ -177,15 +177,7 @@ c++.install-common: installdirs -( cd $(DESTDIR)$(bindir) && \ $(LN) $(GXX_INSTALL_NAME)$(exeext) $(CXX_INSTALL_NAME)$(exeext) ) -if [ -f cc1plus$(exeext) ] ; then \ - if [ -f g++-cross$(exeext) ] ; then \ - if [ -d $(DESTDIR)$(gcc_tooldir)/bin/. ] ; then \ - rm -f $(DESTDIR)$(gcc_tooldir)/bin/g++$(exeext); \ - $(INSTALL_PROGRAM) g++-cross$(exeext) $(DESTDIR)$(gcc_tooldir)/bin/g++$(exeext); \ - rm -f $(DESTDIR)$(gcc_tooldir)/bin/c++$(exeext); \ - ( cd $(DESTDIR)$(gcc_tooldir)/bin && \ - $(LN) g++$(exeext) c++$(exeext) ); \ - else true; fi; \ - else \ + if [ ! -f g++-cross$(exeext) ] ; then \ rm -f $(DESTDIR)$(bindir)/$(GXX_TARGET_INSTALL_NAME)$(exeext); \ ( cd $(DESTDIR)$(bindir) && \ $(LN) $(GXX_INSTALL_NAME)$(exeext) $(GXX_TARGET_INSTALL_NAME)$(exeext) ); \ diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index dba8032c7125..9695e9bcf225 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,8 @@ +2013-09-12 Brooks Moses + + PR driver/42955 + * Make-lang.in: Do not install driver binaries in $(target)/bin. + 2013-09-09 Tobias Burnus * invoke.texi (Error and Warning Options): Add hyphen. diff --git a/gcc/fortran/Make-lang.in b/gcc/fortran/Make-lang.in index ee704233bba0..47deca61c6fb 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 ; \