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

previous 'make bootstrap'.
        * Makefile.in: Regenerate.
This commit is contained in:
Jason Merrill 2002-12-17 20:38:05 +00:00
parent 38d49aff68
commit b72e6a2de5
3 changed files with 20 additions and 8 deletions

View file

@ -1,3 +1,9 @@
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.
2002-12-17 Hans-Peter Nilsson <hp@bitrange.com> 2002-12-17 Hans-Peter Nilsson <hp@bitrange.com>
* configure.in (noconfigdirs) [mmix-*-*]: Disable libgloss and gdb. * configure.in (noconfigdirs) [mmix-*-*]: Disable libgloss and gdb.

View file

@ -7460,14 +7460,17 @@ gcc/Makefile: config.status
$(HOST_CONFIGARGS) $${srcdiroption} \ $(HOST_CONFIGARGS) $${srcdiroption} \
|| exit 1 || exit 1
# Don't remake gcc if it's already been made by 'bootstrap'; that causes # Don't 'make all' in gcc if it's already been made by 'bootstrap'; that
# nothing but trouble. This wart will be fixed eventually by moving # causes trouble. This wart will be fixed eventually by moving
# the bootstrap behavior to this file. # the bootstrap behavior to this file.
.PHONY: all-gcc maybe-all-gcc .PHONY: all-gcc maybe-all-gcc
maybe-all-gcc: maybe-all-gcc:
all-gcc: configure-gcc all-gcc: configure-gcc
@if [ -f gcc/xgcc ] ; then \ @if [ -f gcc/stage_last ] ; then \
exit 0 ; \ r=`${PWD}`; export r; \
s=`cd $(srcdir); ${PWD}`; export s; \
$(SET_LIB_PATH) \
(cd gcc; $(MAKE) $(GCC_FLAGS_TO_PASS) quickstrap); \
else \ else \
r=`${PWD}`; export r; \ r=`${PWD}`; export r; \
s=`cd $(srcdir); ${PWD}`; export s; \ s=`cd $(srcdir); ${PWD}`; export s; \

View file

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