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/cp | |
| 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/cp')
| -rw-r--r-- | gcc/cp/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/cp/Make-lang.in | 14 |
2 files changed, 8 insertions, 11 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 470fa1f..68c8ea4 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/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-12 Adam Butcher <adam@jessamine.co.uk> * cp-tree.h (type_uses_auto_or_concept): Declare. diff --git a/gcc/cp/Make-lang.in b/gcc/cp/Make-lang.in index e8d4913..985f22b 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) ); \ |