diff options
| author | Jason Merrill <jason@redhat.com> | 2002-12-17 23:38:05 +0300 |
|---|---|---|
| committer | Jason Merrill <jason@redhat.com> | 2002-12-17 23:38:05 +0300 |
| commit | e5e33f0eb4b368f390d43e649b807f012d1d0ef2 (patch) | |
| tree | 230dffe177e9fa389b3a7a93ccc80471b4ae7884 | |
| parent | 1c6b0134389e1d6a2cf7e407826aa16157b80584 (diff) | |
* Makefile.tpl (all-gcc): Use 'make quickstrap' if there was a
previous 'make bootstrap'.
* Makefile.in: Regenerate.
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | Makefile.in | 11 | ||||
| -rw-r--r-- | Makefile.tpl | 11 |
3 files changed, 20 insertions, 8 deletions
@@ -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 f7c38950f..881c92562 100644 --- 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 9f64035a3..b2f744257 100644 --- 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; \ |