On Tue, 1 Apr 2014, Mike Stump wrote:

> On Mar 31, 2014, at 4:50 AM, Richard Biener <rguent...@suse.de> wrote:
> >     -$(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 \
> >       rm -f $(DESTDIR)$(bindir)/$(target_noncanonical)-gcc-tmp$(exeext); \
> >       ( cd $(DESTDIR)$(bindir) && \
> >         $(LN) $(GCC_INSTALL_NAME)$(exeext) 
> > $(target_noncanonical)-gcc-tmp$(exeext) && \
> > --- 3205,3217 ----
> >  install-driver: installdirs xgcc$(exeext)
> >     -rm -f $(DESTDIR)$(bindir)/$(GCC_INSTALL_NAME)$(exeext)
> >     -$(INSTALL_PROGRAM) xgcc$(exeext) 
> > $(DESTDIR)$(bindir)/$(GCC_INSTALL_NAME)$(exeext)
> > !   -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
> 
> Certainly safer for release like this, but, gotta wonder if we can avoid 
> the ignoring of errors with the added check…

No idea ;)  For my case I ended up without an installed driver as
the rm of course succeeded but the rest not ...

> I’d have to work out why 
> they did that in the first place and run a build and play a bit to be as 
> sure as I’d like to be… but, a cross and a native build I think should 
> test it adequately.

Work out why we install _two_ additional variants!  (or rather why we
install any additional variants to GCC_INSTALL_NAME at all ...).

Anyway, I now committed the patch.  We can always followup with
cleanups to this area later, possibly in stage1.

Richard.

Reply via email to