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

        previous 'make bootstrap'.
        * Makefile.in: Regenerate.

diff --git a/ChangeLog b/ChangeLog
index b96314f..3946cf2 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -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>
 
        * configure.in (noconfigdirs) [mmix-*-*]: Disable libgloss and gdb.

diff --git a/Makefile.in b/Makefile.in
index f7c3895..881c925 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -7460,14 +7460,17 @@ gcc/Makefile: config.status
          $(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
+# 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/xgcc ] ; then \
-         exit 0 ; \
+       @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; \

diff --git a/Makefile.tpl b/Makefile.tpl
index 9f64035..b2f7442 100644 (file)
--- a/Makefile.tpl
+++ b/Makefile.tpl
@@ -1134,14 +1134,17 @@ gcc/Makefile: config.status
          $(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
+# 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/xgcc ] ; then \
-         exit 0 ; \
+       @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; \