PATCH to toplevel all-gcc rule

PATCH to toplevel all-gcc rule

[Jason Merrill]

[-- Attachment #1: Type: text/plain, Size: 445 bytes --]

I was alarmed to discover that since the bib merge, a toplevel 'make'
doesn't rebuild gcc, regardless of what might have changed in the sources.
Fixed thusly; doing a quickstrap seems like the right answer if the gcc
directory already contains a bootstrap.

Applied to trunk.

2002-12-16  Jason Merrill  <jason@redhat.com>

	* Makefile.tpl (all-gcc): Use 'make quickstrap' if there was a
	previous 'make bootstrap'.
	* Makefile.in: Regenerate.


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: Type: text/x-patch, Size: 1234 bytes --]

*** Makefile.tpl.~1~	2002-12-16 15:27:35.000000000 -0500
--- Makefile.tpl	2002-12-16 20:43:14.000000000 -0500
*************** gcc/Makefile: config.status
*** 1134,1147 ****
  	  $(HOST_CONFIGARGS) $${srcdiroption} \
  	  || exit 1
  
! # Don't remake gcc if it's already been made by 'bootstrap'; that causes
! # nothing but trouble.  This wart will be fixed eventually by moving
  # the bootstrap behavior to this file.
  .PHONY: all-gcc maybe-all-gcc
  maybe-all-gcc:
  all-gcc: configure-gcc
! 	@if [ -f gcc/xgcc ] ; then \
! 	  exit 0 ; \
  	else \
  	  r=`${PWD}`; export r; \
  	  s=`cd $(srcdir); ${PWD}`; export s; \
--- 1134,1150 ----
  	  $(HOST_CONFIGARGS) $${srcdiroption} \
  	  || exit 1
  
! # Don't 'make all' in gcc if it's already been made by 'bootstrap'; that
! # causes trouble.  This wart will be fixed eventually by moving
  # the bootstrap behavior to this file.
  .PHONY: all-gcc maybe-all-gcc
  maybe-all-gcc:
  all-gcc: configure-gcc
! 	@if [ -f gcc/stage_last ] ; then \
! 	  r=`${PWD}`; export r; \
! 	  s=`cd $(srcdir); ${PWD}`; export s; \
! 	  $(SET_LIB_PATH) \
! 	  (cd gcc; $(MAKE) $(GCC_FLAGS_TO_PASS) quickstrap); \
  	else \
  	  r=`${PWD}`; export r; \
  	  s=`cd $(srcdir); ${PWD}`; export s; \

Re: PATCH to toplevel all-gcc rule

[DJ Delorie]

> Applied to trunk.
> 
> 2002-12-16  Jason Merrill  <jason@redhat.com>
> 
> 	* Makefile.tpl (all-gcc): Use 'make quickstrap' if there was a
> 	previous 'make bootstrap'.
> 	* Makefile.in: Regenerate.

Ok, but please apply to src as well - these are files we're keeping in
sync between src and gcc.