diff options
Diffstat (limited to 'gcc/cp')
| -rw-r--r-- | gcc/cp/ChangeLog | 9 | ||||
| -rw-r--r-- | gcc/cp/Make-lang.in | 10 |
2 files changed, 14 insertions, 5 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index edb45f4df10..8c30eaae87e 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,12 @@ +2012-11-28 Andrew Pinski <apinski@cavium.com> + + PR bootstrap/54279 + * Make-lang.in (g++$(exeext)): Rename to + (xg++$(exeext)): This. + (g++-cross$(exeext)): Use xg++$(exeext) instead of g++$(exeext). + (c++.start.encap): Likewise. + (c++.install-common): Likewise. + 2012-11-24 Paolo Carlini <paolo.carlini@oracle.com> PR c++/55446 diff --git a/gcc/cp/Make-lang.in b/gcc/cp/Make-lang.in index 9d92f648bee..13abaf9ab33 100644 --- a/gcc/cp/Make-lang.in +++ b/gcc/cp/Make-lang.in @@ -61,15 +61,15 @@ g++spec.o: $(srcdir)/cp/g++spec.c $(SYSTEM_H) coretypes.h $(TM_H) $(GCC_H) \ # Create the compiler driver for g++. GXX_OBJS = $(GCC_OBJS) g++spec.o -g++$(exeext): $(GXX_OBJS) $(EXTRA_GCC_OBJS) libcommon-target.a $(LIBDEPS) +xg++$(exeext): $(GXX_OBJS) $(EXTRA_GCC_OBJS) libcommon-target.a $(LIBDEPS) +$(LINKER) $(ALL_LINKERFLAGS) $(LDFLAGS) -o $@ \ $(GXX_OBJS) $(EXTRA_GCC_OBJS) libcommon-target.a \ $(EXTRA_GCC_LIBS) $(LIBS) # Create a version of the g++ driver which calls the cross-compiler. -g++-cross$(exeext): g++$(exeext) +g++-cross$(exeext): xg++$(exeext) -rm -f g++-cross$(exeext) - cp g++$(exeext) g++-cross$(exeext) + cp xg++$(exeext) g++-cross$(exeext) # The compiler itself. # Shared with C front end: @@ -124,7 +124,7 @@ endif # Build hooks: c++.all.cross: g++-cross$(exeext) -c++.start.encap: g++$(exeext) +c++.start.encap: xg++$(exeext) c++.rest.encap: c++.info: c++.install-info: @@ -172,7 +172,7 @@ check_g++_parallelize = old-deja.exp dg.exp dg-torture.exp # and also as either g++ (if native) or $(tooldir)/bin/g++. c++.install-common: installdirs -rm -f $(DESTDIR)$(bindir)/$(GXX_INSTALL_NAME)$(exeext) - -$(INSTALL_PROGRAM) g++$(exeext) $(DESTDIR)$(bindir)/$(GXX_INSTALL_NAME)$(exeext) + -$(INSTALL_PROGRAM) xg++$(exeext) $(DESTDIR)$(bindir)/$(GXX_INSTALL_NAME)$(exeext) -chmod a+x $(DESTDIR)$(bindir)/$(GXX_INSTALL_NAME)$(exeext) -rm -f $(DESTDIR)$(bindir)/$(CXX_INSTALL_NAME)$(exeext) -( cd $(DESTDIR)$(bindir) && \ |