aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog28
-rw-r--r--Makefile.def4
-rw-r--r--Makefile.in1980
-rw-r--r--Makefile.tpl88
-rwxr-xr-xconfigure171
-rw-r--r--configure.in90
6 files changed, 1035 insertions, 1326 deletions
diff --git a/ChangeLog b/ChangeLog
index 41238fc..349ba11 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,31 @@
+2004-08-26 Paolo Bonzini <bonzini@gnu.org>
+
+ * Makefile.def (bootstrap stages): Add 'lean' parameter.
+ * Makefile.tpl (configure-stageN-*, all-stageN-*): Turned into
+ phony targets; do not generate timestamp files.
+ (distclean-stageN): Remove references to their timestamp files.
+ (restageN, touch-stageN): Remove.
+ (stageN-bubble): Rewritten.
+ (compare): Support lean bootstraps.
+ * Makefile.in: Regenerate.
+
+ * configure.in: Only warn when bootstrapping but
+ build != host or build != target. Support lean bootstraps.
+ * configure: Regenerate.
+
+ Sync from gcc:
+ 2004-08-26 Phil Edwards <phil@codesourcery.com>
+
+ * configure.in: Give a better error message if GMP/MPFR are missing
+ and a language needing them has been requested.
+ * configure: Regenerated.
+
+ 2004-08-25 Phil Edwards <phil@codesourcery.com>
+
+ * configure.in: Print a list of available language front-ends if
+ a requested one is missing. Tidy stray tab characters.
+ * configure: Regenerated.
+
2004-08-17 Paolo Bonzini <bonzini@gnu.org>
* Makefile.in: Regenerate.
diff --git a/Makefile.def b/Makefile.def
index c9de58b..0c8c9a1 100644
--- a/Makefile.def
+++ b/Makefile.def
@@ -445,14 +445,14 @@ bootstrap_stage = {
stage_configure_flags="@stage2_werror_flag@" ;
stage_make_flags="" ; };
bootstrap_stage = {
- id=3 ; prev=2 ;
+ id=3 ; prev=2 ; lean=1 ;
compare_target=compare ;
bootstrap_target=bootstrap ;
cleanstrap_target=cleanstrap ;
stage_configure_flags="@stage2_werror_flag@" ;
stage_make_flags="" ; };
bootstrap_stage = {
- id=4 ; prev=3 ;
+ id=4 ; prev=3 ; lean=2 ;
compare_target=compare3 ;
bootstrap_target=bootstrap4 ;
stage_configure_flags="@stage2_werror_flag@" ;
diff --git a/Makefile.in b/Makefile.in
index fa9432b..1acb6ce5 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -28157,88 +28157,88 @@ POSTSTAGE1_FLAGS_TO_PASS = \
.PHONY: stage1-start stage1-end
stage1-start::
- [ -f stage_current ] && $(MAKE) `cat stage_current`-end || :
+ @[ -f stage_current ] && $(MAKE) `cat stage_current`-end || : ; \
echo stage1 > stage_current ; \
echo stage1 > stage_last
@if bfd
- [ -d stage1-bfd ] || mkdir stage1-bfd; \
+ @[ -d stage1-bfd ] || mkdir stage1-bfd; \
set stage1-bfd bfd ; @CREATE_LINK_TO_DIR@
@endif bfd
@if opcodes
- [ -d stage1-opcodes ] || mkdir stage1-opcodes; \
+ @[ -d stage1-opcodes ] || mkdir stage1-opcodes; \
set stage1-opcodes opcodes ; @CREATE_LINK_TO_DIR@
@endif opcodes
@if binutils
- [ -d stage1-binutils ] || mkdir stage1-binutils; \
+ @[ -d stage1-binutils ] || mkdir stage1-binutils; \
set stage1-binutils binutils ; @CREATE_LINK_TO_DIR@
@endif binutils
@if gas
- [ -d stage1-gas ] || mkdir stage1-gas; \
+ @[ -d stage1-gas ] || mkdir stage1-gas; \
set stage1-gas gas ; @CREATE_LINK_TO_DIR@
@endif gas
@if gcc
- [ -d stage1-gcc ] || mkdir stage1-gcc; \
+ @[ -d stage1-gcc ] || mkdir stage1-gcc; \
set stage1-gcc gcc ; @CREATE_LINK_TO_DIR@
@endif gcc
@if intl
- [ -d stage1-intl ] || mkdir stage1-intl; \
+ @[ -d stage1-intl ] || mkdir stage1-intl; \
set stage1-intl intl ; @CREATE_LINK_TO_DIR@
@endif intl
@if ld
- [ -d stage1-ld ] || mkdir stage1-ld; \
+ @[ -d stage1-ld ] || mkdir stage1-ld; \
set stage1-ld ld ; @CREATE_LINK_TO_DIR@
@endif ld
@if libcpp
- [ -d stage1-libcpp ] || mkdir stage1-libcpp; \
+ @[ -d stage1-libcpp ] || mkdir stage1-libcpp; \
set stage1-libcpp libcpp ; @CREATE_LINK_TO_DIR@
@endif libcpp
@if libbanshee
- [ -d stage1-libbanshee ] || mkdir stage1-libbanshee; \
+ @[ -d stage1-libbanshee ] || mkdir stage1-libbanshee; \
set stage1-libbanshee libbanshee ; @CREATE_LINK_TO_DIR@
@endif libbanshee
@if libiberty
- [ -d stage1-libiberty ] || mkdir stage1-libiberty; \
+ @[ -d stage1-libiberty ] || mkdir stage1-libiberty; \
set stage1-libiberty libiberty ; @CREATE_LINK_TO_DIR@
@endif libiberty
@if zlib
- [ -d stage1-zlib ] || mkdir stage1-zlib; \
+ @[ -d stage1-zlib ] || mkdir stage1-zlib; \
set stage1-zlib zlib ; @CREATE_LINK_TO_DIR@
@endif zlib
stage1-end::
- rm -f stage_current
+ @rm -f stage_current
@if bfd
- set bfd stage1-bfd ; @UNDO_LINK_TO_DIR@
+ @set bfd stage1-bfd ; @UNDO_LINK_TO_DIR@
@endif bfd
@if opcodes
- set opcodes stage1-opcodes ; @UNDO_LINK_TO_DIR@
+ @set opcodes stage1-opcodes ; @UNDO_LINK_TO_DIR@
@endif opcodes
@if binutils
- set binutils stage1-binutils ; @UNDO_LINK_TO_DIR@
+ @set binutils stage1-binutils ; @UNDO_LINK_TO_DIR@
@endif binutils
@if gas
- set gas stage1-gas ; @UNDO_LINK_TO_DIR@
+ @set gas stage1-gas ; @UNDO_LINK_TO_DIR@
@endif gas
@if gcc
- set gcc stage1-gcc ; @UNDO_LINK_TO_DIR@
+ @set gcc stage1-gcc ; @UNDO_LINK_TO_DIR@
@endif gcc
@if intl
- set intl stage1-intl ; @UNDO_LINK_TO_DIR@
+ @set intl stage1-intl ; @UNDO_LINK_TO_DIR@
@endif intl
@if ld
- set ld stage1-ld ; @UNDO_LINK_TO_DIR@
+ @set ld stage1-ld ; @UNDO_LINK_TO_DIR@
@endif ld
@if libcpp
- set libcpp stage1-libcpp ; @UNDO_LINK_TO_DIR@
+ @set libcpp stage1-libcpp ; @UNDO_LINK_TO_DIR@
@endif libcpp
@if libbanshee
- set libbanshee stage1-libbanshee ; @UNDO_LINK_TO_DIR@
+ @set libbanshee stage1-libbanshee ; @UNDO_LINK_TO_DIR@
@endif libbanshee
@if libiberty
- set libiberty stage1-libiberty ; @UNDO_LINK_TO_DIR@
+ @set libiberty stage1-libiberty ; @UNDO_LINK_TO_DIR@
@endif libiberty
@if zlib
- set zlib stage1-zlib ; @UNDO_LINK_TO_DIR@
+ @set zlib stage1-zlib ; @UNDO_LINK_TO_DIR@
@endif zlib
# Bubble a bugfix through all the stages up to stage 1. They
@@ -28246,11 +28246,11 @@ stage1-end::
# be reconfigured as well.
.PHONY: stage1-bubble
stage1-bubble::
- @case `echo all-stage1-*` in \
- 'all-stage1-*') ;; \
- *) echo Remaking stage 1 ; rm -f all-stage1-* ;; \
- esac ; \
- $(MAKE) $(RECURSE_FLAGS_TO_PASS) all-stage1
+ @if test -f stage1-lean ; then \
+ echo Skipping rebuild of stage1 ; \
+ else \
+ $(MAKE) $(RECURSE_FLAGS_TO_PASS) all-stage1; \
+ fi
.PHONY: all-stage1
all-stage1: \
@@ -28267,19 +28267,17 @@ all-stage1: \
maybe-all-stage1-zlib
+.PHONY: configure-stage1-bfd maybe-configure-stage1-bfd
+.PHONY: all-stage1-bfd maybe-all-stage1-bfd
+
maybe-configure-stage1-bfd:
maybe-all-stage1-bfd:
@if bfd-bootstrap
maybe-configure-stage1-bfd: configure-stage1-bfd
-configure-stage1-bfd:
- $(MAKE) stage1-start
- @if [ -f stage1-bfd/Makefile ] ; then \
- $(STAMP) configure-stage1-bfd ; \
- exit 0; \
- else \
- true ; \
- fi ; \
+configure-stage1-bfd:
+ @$(MAKE) stage1-start
+ @[ -f bfd/Makefile ] && exit 0 || : ; \
r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(HOST_EXPORTS) \
@@ -28298,34 +28296,30 @@ configure-stage1-bfd:
esac; \
$(SHELL) $${libsrcdir}/configure \
$(HOST_CONFIGARGS) $${srcdiroption} \
- --disable-intermodule --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" && \
- $(STAMP) ../configure-stage1-bfd
+ --disable-intermodule --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)"
maybe-all-stage1-bfd: all-stage1-bfd
all-stage1-bfd: configure-stage1-bfd
- $(MAKE) stage1-start
+ @$(MAKE) stage1-start
@r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(HOST_EXPORTS) \
cd bfd && \
$(MAKE) $(FLAGS_TO_PASS) \
- CFLAGS="$(STAGE1_CFLAGS)" && \
- $(STAMP) ../all-stage1-bfd
+ CFLAGS="$(STAGE1_CFLAGS)"
@endif bfd-bootstrap
+.PHONY: configure-stage1-opcodes maybe-configure-stage1-opcodes
+.PHONY: all-stage1-opcodes maybe-all-stage1-opcodes
+
maybe-configure-stage1-opcodes:
maybe-all-stage1-opcodes:
@if opcodes-bootstrap
maybe-configure-stage1-opcodes: configure-stage1-opcodes
-configure-stage1-opcodes:
- $(MAKE) stage1-start
- @if [ -f stage1-opcodes/Makefile ] ; then \
- $(STAMP) configure-stage1-opcodes ; \
- exit 0; \
- else \
- true ; \
- fi ; \
+configure-stage1-opcodes:
+ @$(MAKE) stage1-start
+ @[ -f opcodes/Makefile ] && exit 0 || : ; \
r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(HOST_EXPORTS) \
@@ -28344,34 +28338,30 @@ configure-stage1-opcodes:
esac; \
$(SHELL) $${libsrcdir}/configure \
$(HOST_CONFIGARGS) $${srcdiroption} \
- --disable-intermodule --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" && \
- $(STAMP) ../configure-stage1-opcodes
+ --disable-intermodule --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)"
maybe-all-stage1-opcodes: all-stage1-opcodes
all-stage1-opcodes: configure-stage1-opcodes
- $(MAKE) stage1-start
+ @$(MAKE) stage1-start
@r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(HOST_EXPORTS) \
cd opcodes && \
$(MAKE) $(FLAGS_TO_PASS) \
- CFLAGS="$(STAGE1_CFLAGS)" && \
- $(STAMP) ../all-stage1-opcodes
+ CFLAGS="$(STAGE1_CFLAGS)"
@endif opcodes-bootstrap
+.PHONY: configure-stage1-binutils maybe-configure-stage1-binutils
+.PHONY: all-stage1-binutils maybe-all-stage1-binutils
+
maybe-configure-stage1-binutils:
maybe-all-stage1-binutils:
@if binutils-bootstrap
maybe-configure-stage1-binutils: configure-stage1-binutils
-configure-stage1-binutils:
- $(MAKE) stage1-start
- @if [ -f stage1-binutils/Makefile ] ; then \
- $(STAMP) configure-stage1-binutils ; \
- exit 0; \
- else \
- true ; \
- fi ; \
+configure-stage1-binutils:
+ @$(MAKE) stage1-start
+ @[ -f binutils/Makefile ] && exit 0 || : ; \
r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(HOST_EXPORTS) \
@@ -28390,34 +28380,30 @@ configure-stage1-binutils:
esac; \
$(SHELL) $${libsrcdir}/configure \
$(HOST_CONFIGARGS) $${srcdiroption} \
- --disable-intermodule --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" && \
- $(STAMP) ../configure-stage1-binutils
+ --disable-intermodule --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)"
maybe-all-stage1-binutils: all-stage1-binutils
all-stage1-binutils: configure-stage1-binutils
- $(MAKE) stage1-start
+ @$(MAKE) stage1-start
@r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(HOST_EXPORTS) \
cd binutils && \
$(MAKE) $(FLAGS_TO_PASS) \
- CFLAGS="$(STAGE1_CFLAGS)" && \
- $(STAMP) ../all-stage1-binutils
+ CFLAGS="$(STAGE1_CFLAGS)"
@endif binutils-bootstrap
+.PHONY: configure-stage1-gas maybe-configure-stage1-gas
+.PHONY: all-stage1-gas maybe-all-stage1-gas
+
maybe-configure-stage1-gas:
maybe-all-stage1-gas:
@if gas-bootstrap
maybe-configure-stage1-gas: configure-stage1-gas
-configure-stage1-gas:
- $(MAKE) stage1-start
- @if [ -f stage1-gas/Makefile ] ; then \
- $(STAMP) configure-stage1-gas ; \
- exit 0; \
- else \
- true ; \
- fi ; \
+configure-stage1-gas:
+ @$(MAKE) stage1-start
+ @[ -f gas/Makefile ] && exit 0 || : ; \
r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(HOST_EXPORTS) \
@@ -28436,34 +28422,30 @@ configure-stage1-gas:
esac; \
$(SHELL) $${libsrcdir}/configure \
$(HOST_CONFIGARGS) $${srcdiroption} \
- --disable-intermodule --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" && \
- $(STAMP) ../configure-stage1-gas
+ --disable-intermodule --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)"
maybe-all-stage1-gas: all-stage1-gas
all-stage1-gas: configure-stage1-gas
- $(MAKE) stage1-start
+ @$(MAKE) stage1-start
@r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(HOST_EXPORTS) \
cd gas && \
$(MAKE) $(FLAGS_TO_PASS) \
- CFLAGS="$(STAGE1_CFLAGS)" && \
- $(STAMP) ../all-stage1-gas
+ CFLAGS="$(STAGE1_CFLAGS)"
@endif gas-bootstrap
+.PHONY: configure-stage1-gcc maybe-configure-stage1-gcc
+.PHONY: all-stage1-gcc maybe-all-stage1-gcc
+
maybe-configure-stage1-gcc:
maybe-all-stage1-gcc:
@if gcc-bootstrap
maybe-configure-stage1-gcc: configure-stage1-gcc
-configure-stage1-gcc:
- $(MAKE) stage1-start
- @if [ -f stage1-gcc/Makefile ] ; then \
- $(STAMP) configure-stage1-gcc ; \
- exit 0; \
- else \
- true ; \
- fi ; \
+configure-stage1-gcc:
+ @$(MAKE) stage1-start
+ @[ -f gcc/Makefile ] && exit 0 || : ; \
r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(HOST_EXPORTS) \
@@ -28482,34 +28464,30 @@ configure-stage1-gcc:
esac; \
$(SHELL) $${libsrcdir}/configure \
$(HOST_CONFIGARGS) $${srcdiroption} \
- --disable-intermodule --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" && \
- $(STAMP) ../configure-stage1-gcc
+ --disable-intermodule --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)"
maybe-all-stage1-gcc: all-stage1-gcc
all-stage1-gcc: configure-stage1-gcc
- $(MAKE) stage1-start
+ @$(MAKE) stage1-start
@r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(HOST_EXPORTS) \
cd gcc && \
$(MAKE) $(FLAGS_TO_PASS) \
- CFLAGS="$(STAGE1_CFLAGS)" $(EXTRA_GCC_FLAGS) && \
- $(STAMP) ../all-stage1-gcc
+ CFLAGS="$(STAGE1_CFLAGS)" $(EXTRA_GCC_FLAGS)
@endif gcc-bootstrap
+.PHONY: configure-stage1-intl maybe-configure-stage1-intl
+.PHONY: all-stage1-intl maybe-all-stage1-intl
+
maybe-configure-stage1-intl:
maybe-all-stage1-intl:
@if intl-bootstrap
maybe-configure-stage1-intl: configure-stage1-intl
-configure-stage1-intl:
- $(MAKE) stage1-start
- @if [ -f stage1-intl/Makefile ] ; then \
- $(STAMP) configure-stage1-intl ; \
- exit 0; \
- else \
- true ; \
- fi ; \
+configure-stage1-intl:
+ @$(MAKE) stage1-start
+ @[ -f intl/Makefile ] && exit 0 || : ; \
r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(HOST_EXPORTS) \
@@ -28528,34 +28506,30 @@ configure-stage1-intl:
esac; \
$(SHELL) $${libsrcdir}/configure \
$(HOST_CONFIGARGS) $${srcdiroption} \
- --disable-intermodule --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" && \
- $(STAMP) ../configure-stage1-intl
+ --disable-intermodule --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)"
maybe-all-stage1-intl: all-stage1-intl
all-stage1-intl: configure-stage1-intl
- $(MAKE) stage1-start
+ @$(MAKE) stage1-start
@r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(HOST_EXPORTS) \
cd intl && \
$(MAKE) $(FLAGS_TO_PASS) \
- CFLAGS="$(STAGE1_CFLAGS)" && \
- $(STAMP) ../all-stage1-intl
+ CFLAGS="$(STAGE1_CFLAGS)"
@endif intl-bootstrap
+.PHONY: configure-stage1-ld maybe-configure-stage1-ld
+.PHONY: all-stage1-ld maybe-all-stage1-ld
+
maybe-configure-stage1-ld:
maybe-all-stage1-ld:
@if ld-bootstrap
maybe-configure-stage1-ld: configure-stage1-ld
-configure-stage1-ld:
- $(MAKE) stage1-start
- @if [ -f stage1-ld/Makefile ] ; then \
- $(STAMP) configure-stage1-ld ; \
- exit 0; \
- else \
- true ; \
- fi ; \
+configure-stage1-ld:
+ @$(MAKE) stage1-start
+ @[ -f ld/Makefile ] && exit 0 || : ; \
r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(HOST_EXPORTS) \
@@ -28574,34 +28548,30 @@ configure-stage1-ld:
esac; \
$(SHELL) $${libsrcdir}/configure \
$(HOST_CONFIGARGS) $${srcdiroption} \
- --disable-intermodule --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" && \
- $(STAMP) ../configure-stage1-ld
+ --disable-intermodule --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)"
maybe-all-stage1-ld: all-stage1-ld
all-stage1-ld: configure-stage1-ld
- $(MAKE) stage1-start
+ @$(MAKE) stage1-start
@r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(HOST_EXPORTS) \
cd ld && \
$(MAKE) $(FLAGS_TO_PASS) \
- CFLAGS="$(STAGE1_CFLAGS)" && \
- $(STAMP) ../all-stage1-ld
+ CFLAGS="$(STAGE1_CFLAGS)"
@endif ld-bootstrap
+.PHONY: configure-stage1-libcpp maybe-configure-stage1-libcpp
+.PHONY: all-stage1-libcpp maybe-all-stage1-libcpp
+
maybe-configure-stage1-libcpp:
maybe-all-stage1-libcpp:
@if libcpp-bootstrap
maybe-configure-stage1-libcpp: configure-stage1-libcpp
-configure-stage1-libcpp:
- $(MAKE) stage1-start
- @if [ -f stage1-libcpp/Makefile ] ; then \
- $(STAMP) configure-stage1-libcpp ; \
- exit 0; \
- else \
- true ; \
- fi ; \
+configure-stage1-libcpp:
+ @$(MAKE) stage1-start
+ @[ -f libcpp/Makefile ] && exit 0 || : ; \
r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(HOST_EXPORTS) \
@@ -28620,34 +28590,30 @@ configure-stage1-libcpp:
esac; \
$(SHELL) $${libsrcdir}/configure \
$(HOST_CONFIGARGS) $${srcdiroption} \
- --disable-intermodule --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" && \
- $(STAMP) ../configure-stage1-libcpp
+ --disable-intermodule --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)"
maybe-all-stage1-libcpp: all-stage1-libcpp
all-stage1-libcpp: configure-stage1-libcpp
- $(MAKE) stage1-start
+ @$(MAKE) stage1-start
@r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(HOST_EXPORTS) \
cd libcpp && \
$(MAKE) $(FLAGS_TO_PASS) \
- CFLAGS="$(STAGE1_CFLAGS)" && \
- $(STAMP) ../all-stage1-libcpp
+ CFLAGS="$(STAGE1_CFLAGS)"
@endif libcpp-bootstrap
+.PHONY: configure-stage1-libbanshee maybe-configure-stage1-libbanshee
+.PHONY: all-stage1-libbanshee maybe-all-stage1-libbanshee
+
maybe-configure-stage1-libbanshee:
maybe-all-stage1-libbanshee:
@if libbanshee-bootstrap
maybe-configure-stage1-libbanshee: configure-stage1-libbanshee
-configure-stage1-libbanshee:
- $(MAKE) stage1-start
- @if [ -f stage1-libbanshee/Makefile ] ; then \
- $(STAMP) configure-stage1-libbanshee ; \
- exit 0; \
- else \
- true ; \
- fi ; \
+configure-stage1-libbanshee:
+ @$(MAKE) stage1-start
+ @[ -f libbanshee/Makefile ] && exit 0 || : ; \
r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(HOST_EXPORTS) \
@@ -28666,34 +28632,30 @@ configure-stage1-libbanshee:
esac; \
$(SHELL) $${libsrcdir}/configure \
$(HOST_CONFIGARGS) $${srcdiroption} \
- --disable-intermodule --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" && \
- $(STAMP) ../configure-stage1-libbanshee
+ --disable-intermodule --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)"
maybe-all-stage1-libbanshee: all-stage1-libbanshee
all-stage1-libbanshee: configure-stage1-libbanshee
- $(MAKE) stage1-start
+ @$(MAKE) stage1-start
@r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(HOST_EXPORTS) \
cd libbanshee && \
$(MAKE) $(FLAGS_TO_PASS) \
- CFLAGS="$(STAGE1_CFLAGS)" && \
- $(STAMP) ../all-stage1-libbanshee
+ CFLAGS="$(STAGE1_CFLAGS)"
@endif libbanshee-bootstrap
+.PHONY: configure-stage1-libiberty maybe-configure-stage1-libiberty
+.PHONY: all-stage1-libiberty maybe-all-stage1-libiberty
+
maybe-configure-stage1-libiberty:
maybe-all-stage1-libiberty:
@if libiberty-bootstrap
maybe-configure-stage1-libiberty: configure-stage1-libiberty
-configure-stage1-libiberty:
- $(MAKE) stage1-start
- @if [ -f stage1-libiberty/Makefile ] ; then \
- $(STAMP) configure-stage1-libiberty ; \
- exit 0; \
- else \
- true ; \
- fi ; \
+configure-stage1-libiberty:
+ @$(MAKE) stage1-start
+ @[ -f libiberty/Makefile ] && exit 0 || : ; \
r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(HOST_EXPORTS) \
@@ -28712,34 +28674,30 @@ configure-stage1-libiberty:
esac; \
$(SHELL) $${libsrcdir}/configure \
$(HOST_CONFIGARGS) $${srcdiroption} \
- --disable-intermodule --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" && \
- $(STAMP) ../configure-stage1-libiberty
+ --disable-intermodule --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)"
maybe-all-stage1-libiberty: all-stage1-libiberty
all-stage1-libiberty: configure-stage1-libiberty
- $(MAKE) stage1-start
+ @$(MAKE) stage1-start
@r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(HOST_EXPORTS) \
cd libiberty && \
$(MAKE) $(FLAGS_TO_PASS) \
- CFLAGS="$(STAGE1_CFLAGS)" && \
- $(STAMP) ../all-stage1-libiberty
+ CFLAGS="$(STAGE1_CFLAGS)"
@endif libiberty-bootstrap
+.PHONY: configure-stage1-zlib maybe-configure-stage1-zlib
+.PHONY: all-stage1-zlib maybe-all-stage1-zlib
+
maybe-configure-stage1-zlib:
maybe-all-stage1-zlib:
@if zlib-bootstrap
maybe-configure-stage1-zlib: configure-stage1-zlib
-configure-stage1-zlib:
- $(MAKE) stage1-start
- @if [ -f stage1-zlib/Makefile ] ; then \
- $(STAMP) configure-stage1-zlib ; \
- exit 0; \
- else \
- true ; \
- fi ; \
+configure-stage1-zlib:
+ @$(MAKE) stage1-start
+ @[ -f zlib/Makefile ] && exit 0 || : ; \
r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(HOST_EXPORTS) \
@@ -28758,19 +28716,17 @@ configure-stage1-zlib:
esac; \
$(SHELL) $${libsrcdir}/configure \
$(HOST_CONFIGARGS) $${srcdiroption} \
- --disable-intermodule --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)" && \
- $(STAMP) ../configure-stage1-zlib
+ --disable-intermodule --disable-coverage --enable-languages="$(STAGE1_LANGUAGES)"
maybe-all-stage1-zlib: all-stage1-zlib
all-stage1-zlib: configure-stage1-zlib
- $(MAKE) stage1-start
+ @$(MAKE) stage1-start
@r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(HOST_EXPORTS) \
cd zlib && \
$(MAKE) $(FLAGS_TO_PASS) \
- CFLAGS="$(STAGE1_CFLAGS)" && \
- $(STAMP) ../all-stage1-zlib
+ CFLAGS="$(STAGE1_CFLAGS)"
@endif zlib-bootstrap
@@ -28781,35 +28737,13 @@ all-stage1-zlib: configure-stage1-zlib
-.PHONY: restage1 touch-stage1 distclean-stage1
+.PHONY: distclean-stage1
# Rules to wipe a stage and all the following ones, used for cleanstrap
distclean-stage1::
[ -f stage_current ] && $(MAKE) `cat stage_current`-end || :
- rm -rf configure-stage1-* all-stage1-* stage1-*
-
-# Rules to renew the timestamp on a stage and all the following ones
-
-touch-stage1::
- @case `echo configure-stage1-*` in \
- 'configure-stage1-*') ;; \
- *) \
- echo '$(STAMP)' configure-stage1-* && \
- $(STAMP) configure-stage1-* ;; \
- esac ; \
- case `echo all-stage1-*` in \
- 'all-stage1-*') ;; \
- *) \
- echo '$(STAMP)' all-stage1-* && \
- $(STAMP) all-stage1-* ;; \
- esac
-
-# After building a stage, touch the following ones
-
-restage1::
- rm -rf all-stage1-*
- $(MAKE) $(RECURSE_FLAGS_TO_PASS) all-stage1
+ rm -rf stage1-*
@endif gcc-bootstrap
@@ -28818,109 +28752,109 @@ restage1::
.PHONY: stage2-start stage2-end
stage2-start::
- [ -f stage_current ] && $(MAKE) `cat stage_current`-end || :
+ @[ -f stage_current ] && $(MAKE) `cat stage_current`-end || : ; \
echo stage2 > stage_current ; \
echo stage2 > stage_last
@if bfd
- [ -d stage2-bfd ] || mkdir stage2-bfd; \
+ @[ -d stage2-bfd ] || mkdir stage2-bfd; \
set stage2-bfd bfd ; @CREATE_LINK_TO_DIR@ ; \
set stage1-bfd prev-bfd ; @CREATE_LINK_TO_DIR@
@endif bfd
@if opcodes
- [ -d stage2-opcodes ] || mkdir stage2-opcodes; \
+ @[ -d stage2-opcodes ] || mkdir stage2-opcodes; \
set stage2-opcodes opcodes ; @CREATE_LINK_TO_DIR@ ; \
set stage1-opcodes prev-opcodes ; @CREATE_LINK_TO_DIR@
@endif opcodes
@if binutils
- [ -d stage2-binutils ] || mkdir stage2-binutils; \
+ @[ -d stage2-binutils ] || mkdir stage2-binutils; \
set stage2-binutils binutils ; @CREATE_LINK_TO_DIR@ ; \
set stage1-binutils prev-binutils ; @CREATE_LINK_TO_DIR@
@endif binutils
@if gas
- [ -d stage2-gas ] || mkdir stage2-gas; \
+ @[ -d stage2-gas ] || mkdir stage2-gas; \
set stage2-gas gas ; @CREATE_LINK_TO_DIR@ ; \
set stage1-gas prev-gas ; @CREATE_LINK_TO_DIR@
@endif gas
@if gcc
- [ -d stage2-gcc ] || mkdir stage2-gcc; \
+ @[ -d stage2-gcc ] || mkdir stage2-gcc; \
set stage2-gcc gcc ; @CREATE_LINK_TO_DIR@ ; \
set stage1-gcc prev-gcc ; @CREATE_LINK_TO_DIR@
@endif gcc
@if intl
- [ -d stage2-intl ] || mkdir stage2-intl; \
+ @[ -d stage2-intl ] || mkdir stage2-intl; \
set stage2-intl intl ; @CREATE_LINK_TO_DIR@ ; \
set stage1-intl prev-intl ; @CREATE_LINK_TO_DIR@
@endif intl
@if ld
- [ -d stage2-ld ] || mkdir stage2-ld; \
+ @[ -d stage2-ld ] || mkdir stage2-ld; \
set stage2-ld ld ; @CREATE_LINK_TO_DIR@ ; \
set stage1-ld prev-ld ; @CREATE_LINK_TO_DIR@
@endif ld
@if libcpp
- [ -d stage2-libcpp ] || mkdir stage2-libcpp; \
+ @[ -d stage2-libcpp ] || mkdir stage2-libcpp; \
set stage2-libcpp libcpp ; @CREATE_LINK_TO_DIR@ ; \
set stage1-libcpp prev-libcpp ; @CREATE_LINK_TO_DIR@
@endif libcpp
@if libbanshee
- [ -d stage2-libbanshee ] || mkdir stage2-libbanshee; \
+ @[ -d stage2-libbanshee ] || mkdir stage2-libbanshee; \
set stage2-libbanshee libbanshee ; @CREATE_LINK_TO_DIR@ ; \
set stage1-libbanshee prev-libbanshee ; @CREATE_LINK_TO_DIR@
@endif libbanshee
@if libiberty
- [ -d stage2-libiberty ] || mkdir stage2-libiberty; \
+ @[ -d stage2-libiberty ] || mkdir stage2-libiberty; \
set stage2-libiberty libiberty ; @CREATE_LINK_TO_DIR@ ; \
set stage1-libiberty prev-libiberty ; @CREATE_LINK_TO_DIR@
@endif libiberty
@if zlib
- [ -d stage2-zlib ] || mkdir stage2-zlib; \
+ @[ -d stage2-zlib ] || mkdir stage2-zlib; \
set stage2-zlib zlib ; @CREATE_LINK_TO_DIR@ ; \
set stage1-zlib prev-zlib ; @CREATE_LINK_TO_DIR@
@endif zlib
stage2-end::
- rm -f stage_current
+ @rm -f stage_current
@if bfd
- set bfd stage2-bfd ; @UNDO_LINK_TO_DIR@ ; \
+ @set bfd stage2-bfd ; @UNDO_LINK_TO_DIR@ ; \
set prev-bfd stage1-bfd ; @UNDO_LINK_TO_DIR@
@endif bfd
@if opcodes
- set opcodes stage2-opcodes ; @UNDO_LINK_TO_DIR@ ; \
+ @set opcodes stage2-opcodes ; @UNDO_LINK_TO_DIR@ ; \
set prev-opcodes stage1-opcodes ; @UNDO_LINK_TO_DIR@
@endif opcodes
@if binutils
- set binutils stage2-binutils ; @UNDO_LINK_TO_DIR@ ; \
+ @set binutils stage2-binutils ; @UNDO_LINK_TO_DIR@ ; \
set prev-binutils stage1-binutils ; @UNDO_LINK_TO_DIR@
@endif binutils
@if gas
- set gas stage2-gas ; @UNDO_LINK_TO_DIR@ ; \
+ @set gas stage2-gas ; @UNDO_LINK_TO_DIR@ ; \
set prev-gas stage1-gas ; @UNDO_LINK_TO_DIR@
@endif gas
@if gcc
- set gcc stage2-gcc ; @UNDO_LINK_TO_DIR@ ; \
+ @set gcc stage2-gcc ; @UNDO_LINK_TO_DIR@ ; \
set prev-gcc stage1-gcc ; @UNDO_LINK_TO_DIR@
@endif gcc
@if intl
- set intl stage2-intl ; @UNDO_LINK_TO_DIR@ ; \
+ @set intl stage2-intl ; @UNDO_LINK_TO_DIR@ ; \
set prev-intl stage1-intl ; @UNDO_LINK_TO_DIR@
@endif intl
@if ld
- set ld stage2-ld ; @UNDO_LINK_TO_DIR@ ; \
+ @set ld stage2-ld ; @UNDO_LINK_TO_DIR@ ; \
set prev-ld stage1-ld ; @UNDO_LINK_TO_DIR@
@endif ld
@if libcpp
- set libcpp stage2-libcpp ; @UNDO_LINK_TO_DIR@ ; \
+ @set libcpp stage2-libcpp ; @UNDO_LINK_TO_DIR@ ; \
set prev-libcpp stage1-libcpp ; @UNDO_LINK_TO_DIR@
@endif libcpp
@if libbanshee
- set libbanshee stage2-libbanshee ; @UNDO_LINK_TO_DIR@ ; \
+ @set libbanshee stage2-libbanshee ; @UNDO_LINK_TO_DIR@ ; \
set prev-libbanshee stage1-libbanshee ; @UNDO_LINK_TO_DIR@
@endif libbanshee
@if libiberty
- set libiberty stage2-libiberty ; @UNDO_LINK_TO_DIR@ ; \
+ @set libiberty stage2-libiberty ; @UNDO_LINK_TO_DIR@ ; \
set prev-libiberty stage1-libiberty ; @UNDO_LINK_TO_DIR@
@endif libiberty
@if zlib
- set zlib stage2-zlib ; @UNDO_LINK_TO_DIR@ ; \
+ @set zlib stage2-zlib ; @UNDO_LINK_TO_DIR@ ; \
set prev-zlib stage1-zlib ; @UNDO_LINK_TO_DIR@
@endif zlib
@@ -28929,11 +28863,11 @@ stage2-end::
# be reconfigured as well.
.PHONY: stage2-bubble
stage2-bubble:: stage1-bubble
- @case `echo all-stage2-*` in \
- 'all-stage2-*') ;; \
- *) echo Remaking stage 2 ; rm -f all-stage2-* ;; \
- esac ; \
- $(MAKE) $(RECURSE_FLAGS_TO_PASS) all-stage2
+ @if test -f stage2-lean || test -f stage1-lean ; then \
+ echo Skipping rebuild of stage2 ; \
+ else \
+ $(MAKE) $(RECURSE_FLAGS_TO_PASS) all-stage2; \
+ fi
.PHONY: all-stage2
all-stage2: \
@@ -28950,19 +28884,17 @@ all-stage2: \
maybe-all-stage2-zlib
+.PHONY: configure-stage2-bfd maybe-configure-stage2-bfd
+.PHONY: all-stage2-bfd maybe-all-stage2-bfd
+
maybe-configure-stage2-bfd:
maybe-all-stage2-bfd:
@if bfd-bootstrap
maybe-configure-stage2-bfd: configure-stage2-bfd
-configure-stage2-bfd: maybe-all-stage1-bfd
- $(MAKE) stage2-start
- @if [ -f stage2-bfd/Makefile ] ; then \
- $(STAMP) configure-stage2-bfd ; \
- exit 0; \
- else \
- true ; \
- fi ; \
+configure-stage2-bfd:
+ @$(MAKE) stage2-start
+ @[ -f bfd/Makefile ] && exit 0 || : ; \
r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(STAGE_HOST_EXPORTS) \
@@ -28981,35 +28913,31 @@ configure-stage2-bfd: maybe-all-stage1-bfd
esac; \
$(SHELL) $${libsrcdir}/configure \
$(HOST_CONFIGARGS) $${srcdiroption} \
- @stage2_werror_flag@ && \
- $(STAMP) ../configure-stage2-bfd
+ @stage2_werror_flag@
maybe-all-stage2-bfd: all-stage2-bfd
all-stage2-bfd: configure-stage2-bfd
- $(MAKE) stage2-start
+ @$(MAKE) stage2-start
@r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(STAGE_HOST_EXPORTS) \
cd bfd && \
$(MAKE) $(FLAGS_TO_PASS) \
$(POSTSTAGE1_FLAGS_TO_PASS) \
- && \
- $(STAMP) ../all-stage2-bfd
+
@endif bfd-bootstrap
+.PHONY: configure-stage2-opcodes maybe-configure-stage2-opcodes
+.PHONY: all-stage2-opcodes maybe-all-stage2-opcodes
+
maybe-configure-stage2-opcodes:
maybe-all-stage2-opcodes:
@if opcodes-bootstrap
maybe-configure-stage2-opcodes: configure-stage2-opcodes
-configure-stage2-opcodes: maybe-all-stage1-opcodes
- $(MAKE) stage2-start
- @if [ -f stage2-opcodes/Makefile ] ; then \
- $(STAMP) configure-stage2-opcodes ; \
- exit 0; \
- else \
- true ; \
- fi ; \
+configure-stage2-opcodes:
+ @$(MAKE) stage2-start
+ @[ -f opcodes/Makefile ] && exit 0 || : ; \
r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(STAGE_HOST_EXPORTS) \
@@ -29028,35 +28956,31 @@ configure-stage2-opcodes: maybe-all-stage1-opcodes
esac; \
$(SHELL) $${libsrcdir}/configure \
$(HOST_CONFIGARGS) $${srcdiroption} \
- @stage2_werror_flag@ && \
- $(STAMP) ../configure-stage2-opcodes
+ @stage2_werror_flag@
maybe-all-stage2-opcodes: all-stage2-opcodes
all-stage2-opcodes: configure-stage2-opcodes
- $(MAKE) stage2-start
+ @$(MAKE) stage2-start
@r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(STAGE_HOST_EXPORTS) \
cd opcodes && \
$(MAKE) $(FLAGS_TO_PASS) \
$(POSTSTAGE1_FLAGS_TO_PASS) \
- && \
- $(STAMP) ../all-stage2-opcodes
+
@endif opcodes-bootstrap
+.PHONY: configure-stage2-binutils maybe-configure-stage2-binutils
+.PHONY: all-stage2-binutils maybe-all-stage2-binutils
+
maybe-configure-stage2-binutils:
maybe-all-stage2-binutils:
@if binutils-bootstrap
maybe-configure-stage2-binutils: configure-stage2-binutils
-configure-stage2-binutils: maybe-all-stage1-binutils
- $(MAKE) stage2-start
- @if [ -f stage2-binutils/Makefile ] ; then \
- $(STAMP) configure-stage2-binutils ; \
- exit 0; \
- else \
- true ; \
- fi ; \
+configure-stage2-binutils:
+ @$(MAKE) stage2-start
+ @[ -f binutils/Makefile ] && exit 0 || : ; \
r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(STAGE_HOST_EXPORTS) \
@@ -29075,35 +28999,31 @@ configure-stage2-binutils: maybe-all-stage1-binutils
esac; \
$(SHELL) $${libsrcdir}/configure \
$(HOST_CONFIGARGS) $${srcdiroption} \
- @stage2_werror_flag@ && \
- $(STAMP) ../configure-stage2-binutils
+ @stage2_werror_flag@
maybe-all-stage2-binutils: all-stage2-binutils
all-stage2-binutils: configure-stage2-binutils
- $(MAKE) stage2-start
+ @$(MAKE) stage2-start
@r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(STAGE_HOST_EXPORTS) \
cd binutils && \
$(MAKE) $(FLAGS_TO_PASS) \
$(POSTSTAGE1_FLAGS_TO_PASS) \
- && \
- $(STAMP) ../all-stage2-binutils
+
@endif binutils-bootstrap
+.PHONY: configure-stage2-gas maybe-configure-stage2-gas
+.PHONY: all-stage2-gas maybe-all-stage2-gas
+
maybe-configure-stage2-gas:
maybe-all-stage2-gas:
@if gas-bootstrap
maybe-configure-stage2-gas: configure-stage2-gas
-configure-stage2-gas: maybe-all-stage1-gas
- $(MAKE) stage2-start
- @if [ -f stage2-gas/Makefile ] ; then \
- $(STAMP) configure-stage2-gas ; \
- exit 0; \
- else \
- true ; \
- fi ; \
+configure-stage2-gas:
+ @$(MAKE) stage2-start
+ @[ -f gas/Makefile ] && exit 0 || : ; \
r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(STAGE_HOST_EXPORTS) \
@@ -29122,35 +29042,31 @@ configure-stage2-gas: maybe-all-stage1-gas
esac; \
$(SHELL) $${libsrcdir}/configure \
$(HOST_CONFIGARGS) $${srcdiroption} \
- @stage2_werror_flag@ && \
- $(STAMP) ../configure-stage2-gas
+ @stage2_werror_flag@
maybe-all-stage2-gas: all-stage2-gas
all-stage2-gas: configure-stage2-gas
- $(MAKE) stage2-start
+ @$(MAKE) stage2-start
@r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(STAGE_HOST_EXPORTS) \
cd gas && \
$(MAKE) $(FLAGS_TO_PASS) \
$(POSTSTAGE1_FLAGS_TO_PASS) \
- && \
- $(STAMP) ../all-stage2-gas
+
@endif gas-bootstrap
+.PHONY: configure-stage2-gcc maybe-configure-stage2-gcc
+.PHONY: all-stage2-gcc maybe-all-stage2-gcc
+
maybe-configure-stage2-gcc:
maybe-all-stage2-gcc:
@if gcc-bootstrap
maybe-configure-stage2-gcc: configure-stage2-gcc
-configure-stage2-gcc: maybe-all-stage1-gcc
- $(MAKE) stage2-start
- @if [ -f stage2-gcc/Makefile ] ; then \
- $(STAMP) configure-stage2-gcc ; \
- exit 0; \
- else \
- true ; \
- fi ; \
+configure-stage2-gcc:
+ @$(MAKE) stage2-start
+ @[ -f gcc/Makefile ] && exit 0 || : ; \
r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(STAGE_HOST_EXPORTS) \
@@ -29169,35 +29085,31 @@ configure-stage2-gcc: maybe-all-stage1-gcc
esac; \
$(SHELL) $${libsrcdir}/configure \
$(HOST_CONFIGARGS) $${srcdiroption} \
- @stage2_werror_flag@ && \
- $(STAMP) ../configure-stage2-gcc
+ @stage2_werror_flag@
maybe-all-stage2-gcc: all-stage2-gcc
all-stage2-gcc: configure-stage2-gcc
- $(MAKE) stage2-start
+ @$(MAKE) stage2-start
@r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(STAGE_HOST_EXPORTS) \
cd gcc && \
$(MAKE) $(FLAGS_TO_PASS) \
$(POSTSTAGE1_FLAGS_TO_PASS) \
- $(EXTRA_GCC_FLAGS) && \
- $(STAMP) ../all-stage2-gcc
+ $(EXTRA_GCC_FLAGS)
@endif gcc-bootstrap
+.PHONY: configure-stage2-intl maybe-configure-stage2-intl
+.PHONY: all-stage2-intl maybe-all-stage2-intl
+
maybe-configure-stage2-intl:
maybe-all-stage2-intl:
@if intl-bootstrap
maybe-configure-stage2-intl: configure-stage2-intl
-configure-stage2-intl: maybe-all-stage1-intl
- $(MAKE) stage2-start
- @if [ -f stage2-intl/Makefile ] ; then \
- $(STAMP) configure-stage2-intl ; \
- exit 0; \
- else \
- true ; \
- fi ; \
+configure-stage2-intl:
+ @$(MAKE) stage2-start
+ @[ -f intl/Makefile ] && exit 0 || : ; \
r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(STAGE_HOST_EXPORTS) \
@@ -29216,35 +29128,31 @@ configure-stage2-intl: maybe-all-stage1-intl
esac; \
$(SHELL) $${libsrcdir}/configure \
$(HOST_CONFIGARGS) $${srcdiroption} \
- @stage2_werror_flag@ && \
- $(STAMP) ../configure-stage2-intl
+ @stage2_werror_flag@
maybe-all-stage2-intl: all-stage2-intl
all-stage2-intl: configure-stage2-intl
- $(MAKE) stage2-start
+ @$(MAKE) stage2-start
@r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(STAGE_HOST_EXPORTS) \
cd intl && \
$(MAKE) $(FLAGS_TO_PASS) \
$(POSTSTAGE1_FLAGS_TO_PASS) \
- && \
- $(STAMP) ../all-stage2-intl
+
@endif intl-bootstrap
+.PHONY: configure-stage2-ld maybe-configure-stage2-ld
+.PHONY: all-stage2-ld maybe-all-stage2-ld
+
maybe-configure-stage2-ld:
maybe-all-stage2-ld:
@if ld-bootstrap
maybe-configure-stage2-ld: configure-stage2-ld
-configure-stage2-ld: maybe-all-stage1-ld
- $(MAKE) stage2-start
- @if [ -f stage2-ld/Makefile ] ; then \
- $(STAMP) configure-stage2-ld ; \
- exit 0; \
- else \
- true ; \
- fi ; \
+configure-stage2-ld:
+ @$(MAKE) stage2-start
+ @[ -f ld/Makefile ] && exit 0 || : ; \
r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(STAGE_HOST_EXPORTS) \
@@ -29263,35 +29171,31 @@ configure-stage2-ld: maybe-all-stage1-ld
esac; \
$(SHELL) $${libsrcdir}/configure \
$(HOST_CONFIGARGS) $${srcdiroption} \
- @stage2_werror_flag@ && \
- $(STAMP) ../configure-stage2-ld
+ @stage2_werror_flag@
maybe-all-stage2-ld: all-stage2-ld
all-stage2-ld: configure-stage2-ld
- $(MAKE) stage2-start
+ @$(MAKE) stage2-start
@r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(STAGE_HOST_EXPORTS) \
cd ld && \
$(MAKE) $(FLAGS_TO_PASS) \
$(POSTSTAGE1_FLAGS_TO_PASS) \
- && \
- $(STAMP) ../all-stage2-ld
+
@endif ld-bootstrap
+.PHONY: configure-stage2-libcpp maybe-configure-stage2-libcpp
+.PHONY: all-stage2-libcpp maybe-all-stage2-libcpp
+
maybe-configure-stage2-libcpp:
maybe-all-stage2-libcpp:
@if libcpp-bootstrap
maybe-configure-stage2-libcpp: configure-stage2-libcpp
-configure-stage2-libcpp: maybe-all-stage1-libcpp
- $(MAKE) stage2-start
- @if [ -f stage2-libcpp/Makefile ] ; then \
- $(STAMP) configure-stage2-libcpp ; \
- exit 0; \
- else \
- true ; \
- fi ; \
+configure-stage2-libcpp:
+ @$(MAKE) stage2-start
+ @[ -f libcpp/Makefile ] && exit 0 || : ; \
r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(STAGE_HOST_EXPORTS) \
@@ -29310,35 +29214,31 @@ configure-stage2-libcpp: maybe-all-stage1-libcpp
esac; \
$(SHELL) $${libsrcdir}/configure \
$(HOST_CONFIGARGS) $${srcdiroption} \
- @stage2_werror_flag@ && \
- $(STAMP) ../configure-stage2-libcpp
+ @stage2_werror_flag@
maybe-all-stage2-libcpp: all-stage2-libcpp
all-stage2-libcpp: configure-stage2-libcpp
- $(MAKE) stage2-start
+ @$(MAKE) stage2-start
@r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(STAGE_HOST_EXPORTS) \
cd libcpp && \
$(MAKE) $(FLAGS_TO_PASS) \
$(POSTSTAGE1_FLAGS_TO_PASS) \
- && \
- $(STAMP) ../all-stage2-libcpp
+
@endif libcpp-bootstrap
+.PHONY: configure-stage2-libbanshee maybe-configure-stage2-libbanshee
+.PHONY: all-stage2-libbanshee maybe-all-stage2-libbanshee
+
maybe-configure-stage2-libbanshee:
maybe-all-stage2-libbanshee:
@if libbanshee-bootstrap
maybe-configure-stage2-libbanshee: configure-stage2-libbanshee
-configure-stage2-libbanshee: maybe-all-stage1-libbanshee
- $(MAKE) stage2-start
- @if [ -f stage2-libbanshee/Makefile ] ; then \
- $(STAMP) configure-stage2-libbanshee ; \
- exit 0; \
- else \
- true ; \
- fi ; \
+configure-stage2-libbanshee:
+ @$(MAKE) stage2-start
+ @[ -f libbanshee/Makefile ] && exit 0 || : ; \
r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(STAGE_HOST_EXPORTS) \
@@ -29357,35 +29257,31 @@ configure-stage2-libbanshee: maybe-all-stage1-libbanshee
esac; \
$(SHELL) $${libsrcdir}/configure \
$(HOST_CONFIGARGS) $${srcdiroption} \
- @stage2_werror_flag@ && \
- $(STAMP) ../configure-stage2-libbanshee
+ @stage2_werror_flag@
maybe-all-stage2-libbanshee: all-stage2-libbanshee
all-stage2-libbanshee: configure-stage2-libbanshee
- $(MAKE) stage2-start
+ @$(MAKE) stage2-start
@r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(STAGE_HOST_EXPORTS) \
cd libbanshee && \
$(MAKE) $(FLAGS_TO_PASS) \
$(POSTSTAGE1_FLAGS_TO_PASS) \
- && \
- $(STAMP) ../all-stage2-libbanshee
+
@endif libbanshee-bootstrap
+.PHONY: configure-stage2-libiberty maybe-configure-stage2-libiberty
+.PHONY: all-stage2-libiberty maybe-all-stage2-libiberty
+
maybe-configure-stage2-libiberty:
maybe-all-stage2-libiberty:
@if libiberty-bootstrap
maybe-configure-stage2-libiberty: configure-stage2-libiberty
-configure-stage2-libiberty: maybe-all-stage1-libiberty
- $(MAKE) stage2-start
- @if [ -f stage2-libiberty/Makefile ] ; then \
- $(STAMP) configure-stage2-libiberty ; \
- exit 0; \
- else \
- true ; \
- fi ; \
+configure-stage2-libiberty:
+ @$(MAKE) stage2-start
+ @[ -f libiberty/Makefile ] && exit 0 || : ; \
r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(STAGE_HOST_EXPORTS) \
@@ -29404,35 +29300,31 @@ configure-stage2-libiberty: maybe-all-stage1-libiberty
esac; \
$(SHELL) $${libsrcdir}/configure \
$(HOST_CONFIGARGS) $${srcdiroption} \
- @stage2_werror_flag@ && \
- $(STAMP) ../configure-stage2-libiberty
+ @stage2_werror_flag@
maybe-all-stage2-libiberty: all-stage2-libiberty
all-stage2-libiberty: configure-stage2-libiberty
- $(MAKE) stage2-start
+ @$(MAKE) stage2-start
@r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(STAGE_HOST_EXPORTS) \
cd libiberty && \
$(MAKE) $(FLAGS_TO_PASS) \
$(POSTSTAGE1_FLAGS_TO_PASS) \
- && \
- $(STAMP) ../all-stage2-libiberty
+
@endif libiberty-bootstrap
+.PHONY: configure-stage2-zlib maybe-configure-stage2-zlib
+.PHONY: all-stage2-zlib maybe-all-stage2-zlib
+
maybe-configure-stage2-zlib:
maybe-all-stage2-zlib:
@if zlib-bootstrap
maybe-configure-stage2-zlib: configure-stage2-zlib
-configure-stage2-zlib: maybe-all-stage1-zlib
- $(MAKE) stage2-start
- @if [ -f stage2-zlib/Makefile ] ; then \
- $(STAMP) configure-stage2-zlib ; \
- exit 0; \
- else \
- true ; \
- fi ; \
+configure-stage2-zlib:
+ @$(MAKE) stage2-start
+ @[ -f zlib/Makefile ] && exit 0 || : ; \
r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(STAGE_HOST_EXPORTS) \
@@ -29451,20 +29343,18 @@ configure-stage2-zlib: maybe-all-stage1-zlib
esac; \
$(SHELL) $${libsrcdir}/configure \
$(HOST_CONFIGARGS) $${srcdiroption} \
- @stage2_werror_flag@ && \
- $(STAMP) ../configure-stage2-zlib
+ @stage2_werror_flag@
maybe-all-stage2-zlib: all-stage2-zlib
all-stage2-zlib: configure-stage2-zlib
- $(MAKE) stage2-start
+ @$(MAKE) stage2-start
@r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(STAGE_HOST_EXPORTS) \
cd zlib && \
$(MAKE) $(FLAGS_TO_PASS) \
$(POSTSTAGE1_FLAGS_TO_PASS) \
- && \
- $(STAMP) ../all-stage2-zlib
+
@endif zlib-bootstrap
@@ -29478,35 +29368,13 @@ all-stage2-zlib: configure-stage2-zlib
bootstrap2: stage2-bubble all
-.PHONY: restage2 touch-stage2 distclean-stage2
+.PHONY: distclean-stage2
# Rules to wipe a stage and all the following ones, used for cleanstrap
distclean-stage1:: distclean-stage2
distclean-stage2::
[ -f stage_current ] && $(MAKE) `cat stage_current`-end || :
- rm -rf configure-stage2-* all-stage2-* stage2-*
-
-# Rules to renew the timestamp on a stage and all the following ones
-touch-stage1:: touch-stage2
-touch-stage2::
- @case `echo configure-stage2-*` in \
- 'configure-stage2-*') ;; \
- *) \
- echo '$(STAMP)' configure-stage2-* && \
- $(STAMP) configure-stage2-* ;; \
- esac ; \
- case `echo all-stage2-*` in \
- 'all-stage2-*') ;; \
- *) \
- echo '$(STAMP)' all-stage2-* && \
- $(STAMP) all-stage2-* ;; \
- esac
-
-# After building a stage, touch the following ones
-restage1:: touch-stage2
-restage2::
- rm -rf all-stage2-*
- $(MAKE) $(RECURSE_FLAGS_TO_PASS) all-stage2
+ rm -rf stage2-*
@endif gcc-bootstrap
@@ -29515,109 +29383,109 @@ restage2::
.PHONY: stage3-start stage3-end
stage3-start::
- [ -f stage_current ] && $(MAKE) `cat stage_current`-end || :
+ @[ -f stage_current ] && $(MAKE) `cat stage_current`-end || : ; \
echo stage3 > stage_current ; \
echo stage3 > stage_last
@if bfd
- [ -d stage3-bfd ] || mkdir stage3-bfd; \
+ @[ -d stage3-bfd ] || mkdir stage3-bfd; \
set stage3-bfd bfd ; @CREATE_LINK_TO_DIR@ ; \
set stage2-bfd prev-bfd ; @CREATE_LINK_TO_DIR@
@endif bfd
@if opcodes
- [ -d stage3-opcodes ] || mkdir stage3-opcodes; \
+ @[ -d stage3-opcodes ] || mkdir stage3-opcodes; \
set stage3-opcodes opcodes ; @CREATE_LINK_TO_DIR@ ; \
set stage2-opcodes prev-opcodes ; @CREATE_LINK_TO_DIR@
@endif opcodes
@if binutils
- [ -d stage3-binutils ] || mkdir stage3-binutils; \
+ @[ -d stage3-binutils ] || mkdir stage3-binutils; \
set stage3-binutils binutils ; @CREATE_LINK_TO_DIR@ ; \
set stage2-binutils prev-binutils ; @CREATE_LINK_TO_DIR@
@endif binutils
@if gas
- [ -d stage3-gas ] || mkdir stage3-gas; \
+ @[ -d stage3-gas ] || mkdir stage3-gas; \
set stage3-gas gas ; @CREATE_LINK_TO_DIR@ ; \
set stage2-gas prev-gas ; @CREATE_LINK_TO_DIR@
@endif gas
@if gcc
- [ -d stage3-gcc ] || mkdir stage3-gcc; \
+ @[ -d stage3-gcc ] || mkdir stage3-gcc; \
set stage3-gcc gcc ; @CREATE_LINK_TO_DIR@ ; \
set stage2-gcc prev-gcc ; @CREATE_LINK_TO_DIR@
@endif gcc
@if intl
- [ -d stage3-intl ] || mkdir stage3-intl; \
+ @[ -d stage3-intl ] || mkdir stage3-intl; \
set stage3-intl intl ; @CREATE_LINK_TO_DIR@ ; \
set stage2-intl prev-intl ; @CREATE_LINK_TO_DIR@
@endif intl
@if ld
- [ -d stage3-ld ] || mkdir stage3-ld; \
+ @[ -d stage3-ld ] || mkdir stage3-ld; \
set stage3-ld ld ; @CREATE_LINK_TO_DIR@ ; \
set stage2-ld prev-ld ; @CREATE_LINK_TO_DIR@
@endif ld
@if libcpp
- [ -d stage3-libcpp ] || mkdir stage3-libcpp; \
+ @[ -d stage3-libcpp ] || mkdir stage3-libcpp; \
set stage3-libcpp libcpp ; @CREATE_LINK_TO_DIR@ ; \
set stage2-libcpp prev-libcpp ; @CREATE_LINK_TO_DIR@
@endif libcpp
@if libbanshee
- [ -d stage3-libbanshee ] || mkdir stage3-libbanshee; \
+ @[ -d stage3-libbanshee ] || mkdir stage3-libbanshee; \
set stage3-libbanshee libbanshee ; @CREATE_LINK_TO_DIR@ ; \
set stage2-libbanshee prev-libbanshee ; @CREATE_LINK_TO_DIR@
@endif libbanshee
@if libiberty
- [ -d stage3-libiberty ] || mkdir stage3-libiberty; \
+ @[ -d stage3-libiberty ] || mkdir stage3-libiberty; \
set stage3-libiberty libiberty ; @CREATE_LINK_TO_DIR@ ; \
set stage2-libiberty prev-libiberty ; @CREATE_LINK_TO_DIR@
@endif libiberty
@if zlib
- [ -d stage3-zlib ] || mkdir stage3-zlib; \
+ @[ -d stage3-zlib ] || mkdir stage3-zlib; \
set stage3-zlib zlib ; @CREATE_LINK_TO_DIR@ ; \
set stage2-zlib prev-zlib ; @CREATE_LINK_TO_DIR@
@endif zlib
stage3-end::
- rm -f stage_current
+ @rm -f stage_current
@if bfd
- set bfd stage3-bfd ; @UNDO_LINK_TO_DIR@ ; \
+ @set bfd stage3-bfd ; @UNDO_LINK_TO_DIR@ ; \
set prev-bfd stage2-bfd ; @UNDO_LINK_TO_DIR@
@endif bfd
@if opcodes
- set opcodes stage3-opcodes ; @UNDO_LINK_TO_DIR@ ; \
+ @set opcodes stage3-opcodes ; @UNDO_LINK_TO_DIR@ ; \
set prev-opcodes stage2-opcodes ; @UNDO_LINK_TO_DIR@
@endif opcodes
@if binutils
- set binutils stage3-binutils ; @UNDO_LINK_TO_DIR@ ; \
+ @set binutils stage3-binutils ; @UNDO_LINK_TO_DIR@ ; \
set prev-binutils stage2-binutils ; @UNDO_LINK_TO_DIR@
@endif binutils
@if gas
- set gas stage3-gas ; @UNDO_LINK_TO_DIR@ ; \
+ @set gas stage3-gas ; @UNDO_LINK_TO_DIR@ ; \
set prev-gas stage2-gas ; @UNDO_LINK_TO_DIR@
@endif gas
@if gcc
- set gcc stage3-gcc ; @UNDO_LINK_TO_DIR@ ; \
+ @set gcc stage3-gcc ; @UNDO_LINK_TO_DIR@ ; \
set prev-gcc stage2-gcc ; @UNDO_LINK_TO_DIR@
@endif gcc
@if intl
- set intl stage3-intl ; @UNDO_LINK_TO_DIR@ ; \
+ @set intl stage3-intl ; @UNDO_LINK_TO_DIR@ ; \
set prev-intl stage2-intl ; @UNDO_LINK_TO_DIR@
@endif intl
@if ld
- set ld stage3-ld ; @UNDO_LINK_TO_DIR@ ; \
+ @set ld stage3-ld ; @UNDO_LINK_TO_DIR@ ; \
set prev-ld stage2-ld ; @UNDO_LINK_TO_DIR@
@endif ld
@if libcpp
- set libcpp stage3-libcpp ; @UNDO_LINK_TO_DIR@ ; \
+ @set libcpp stage3-libcpp ; @UNDO_LINK_TO_DIR@ ; \
set prev-libcpp stage2-libcpp ; @UNDO_LINK_TO_DIR@
@endif libcpp
@if libbanshee
- set libbanshee stage3-libbanshee ; @UNDO_LINK_TO_DIR@ ; \
+ @set libbanshee stage3-libbanshee ; @UNDO_LINK_TO_DIR@ ; \
set prev-libbanshee stage2-libbanshee ; @UNDO_LINK_TO_DIR@
@endif libbanshee
@if libiberty
- set libiberty stage3-libiberty ; @UNDO_LINK_TO_DIR@ ; \
+ @set libiberty stage3-libiberty ; @UNDO_LINK_TO_DIR@ ; \
set prev-libiberty stage2-libiberty ; @UNDO_LINK_TO_DIR@
@endif libiberty
@if zlib
- set zlib stage3-zlib ; @UNDO_LINK_TO_DIR@ ; \
+ @set zlib stage3-zlib ; @UNDO_LINK_TO_DIR@ ; \
set prev-zlib stage2-zlib ; @UNDO_LINK_TO_DIR@
@endif zlib
@@ -29626,11 +29494,12 @@ stage3-end::
# be reconfigured as well.
.PHONY: stage3-bubble
stage3-bubble:: stage2-bubble
- @case `echo all-stage3-*` in \
- 'all-stage3-*') ;; \
- *) echo Remaking stage 3 ; rm -f all-stage3-* ;; \
- esac ; \
- $(MAKE) $(RECURSE_FLAGS_TO_PASS) all-stage3
+ @bootstrap_lean@-rm -rf stage1-* ; $(STAMP) stage1-lean
+ @if test -f stage3-lean || test -f stage2-lean ; then \
+ echo Skipping rebuild of stage3 ; \
+ else \
+ $(MAKE) $(RECURSE_FLAGS_TO_PASS) all-stage3; \
+ fi
.PHONY: all-stage3
all-stage3: \
@@ -29647,19 +29516,17 @@ all-stage3: \
maybe-all-stage3-zlib
+.PHONY: configure-stage3-bfd maybe-configure-stage3-bfd
+.PHONY: all-stage3-bfd maybe-all-stage3-bfd
+
maybe-configure-stage3-bfd:
maybe-all-stage3-bfd:
@if bfd-bootstrap
maybe-configure-stage3-bfd: configure-stage3-bfd
-configure-stage3-bfd: maybe-all-stage2-bfd
- $(MAKE) stage3-start
- @if [ -f stage3-bfd/Makefile ] ; then \
- $(STAMP) configure-stage3-bfd ; \
- exit 0; \
- else \
- true ; \
- fi ; \
+configure-stage3-bfd:
+ @$(MAKE) stage3-start
+ @[ -f bfd/Makefile ] && exit 0 || : ; \
r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(STAGE_HOST_EXPORTS) \
@@ -29678,35 +29545,31 @@ configure-stage3-bfd: maybe-all-stage2-bfd
esac; \
$(SHELL) $${libsrcdir}/configure \
$(HOST_CONFIGARGS) $${srcdiroption} \
- @stage2_werror_flag@ && \
- $(STAMP) ../configure-stage3-bfd
+ @stage2_werror_flag@
maybe-all-stage3-bfd: all-stage3-bfd
all-stage3-bfd: configure-stage3-bfd
- $(MAKE) stage3-start
+ @$(MAKE) stage3-start
@r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(STAGE_HOST_EXPORTS) \
cd bfd && \
$(MAKE) $(FLAGS_TO_PASS) \
$(POSTSTAGE1_FLAGS_TO_PASS) \
- && \
- $(STAMP) ../all-stage3-bfd
+
@endif bfd-bootstrap
+.PHONY: configure-stage3-opcodes maybe-configure-stage3-opcodes
+.PHONY: all-stage3-opcodes maybe-all-stage3-opcodes
+
maybe-configure-stage3-opcodes:
maybe-all-stage3-opcodes:
@if opcodes-bootstrap
maybe-configure-stage3-opcodes: configure-stage3-opcodes
-configure-stage3-opcodes: maybe-all-stage2-opcodes
- $(MAKE) stage3-start
- @if [ -f stage3-opcodes/Makefile ] ; then \
- $(STAMP) configure-stage3-opcodes ; \
- exit 0; \
- else \
- true ; \
- fi ; \
+configure-stage3-opcodes:
+ @$(MAKE) stage3-start
+ @[ -f opcodes/Makefile ] && exit 0 || : ; \
r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(STAGE_HOST_EXPORTS) \
@@ -29725,35 +29588,31 @@ configure-stage3-opcodes: maybe-all-stage2-opcodes
esac; \
$(SHELL) $${libsrcdir}/configure \
$(HOST_CONFIGARGS) $${srcdiroption} \
- @stage2_werror_flag@ && \
- $(STAMP) ../configure-stage3-opcodes
+ @stage2_werror_flag@
maybe-all-stage3-opcodes: all-stage3-opcodes
all-stage3-opcodes: configure-stage3-opcodes
- $(MAKE) stage3-start
+ @$(MAKE) stage3-start
@r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(STAGE_HOST_EXPORTS) \
cd opcodes && \
$(MAKE) $(FLAGS_TO_PASS) \
$(POSTSTAGE1_FLAGS_TO_PASS) \
- && \
- $(STAMP) ../all-stage3-opcodes
+
@endif opcodes-bootstrap
+.PHONY: configure-stage3-binutils maybe-configure-stage3-binutils
+.PHONY: all-stage3-binutils maybe-all-stage3-binutils
+
maybe-configure-stage3-binutils:
maybe-all-stage3-binutils:
@if binutils-bootstrap
maybe-configure-stage3-binutils: configure-stage3-binutils
-configure-stage3-binutils: maybe-all-stage2-binutils
- $(MAKE) stage3-start
- @if [ -f stage3-binutils/Makefile ] ; then \
- $(STAMP) configure-stage3-binutils ; \
- exit 0; \
- else \
- true ; \
- fi ; \
+configure-stage3-binutils:
+ @$(MAKE) stage3-start
+ @[ -f binutils/Makefile ] && exit 0 || : ; \
r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(STAGE_HOST_EXPORTS) \
@@ -29772,35 +29631,31 @@ configure-stage3-binutils: maybe-all-stage2-binutils
esac; \
$(SHELL) $${libsrcdir}/configure \
$(HOST_CONFIGARGS) $${srcdiroption} \
- @stage2_werror_flag@ && \
- $(STAMP) ../configure-stage3-binutils
+ @stage2_werror_flag@
maybe-all-stage3-binutils: all-stage3-binutils
all-stage3-binutils: configure-stage3-binutils
- $(MAKE) stage3-start
+ @$(MAKE) stage3-start
@r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(STAGE_HOST_EXPORTS) \
cd binutils && \
$(MAKE) $(FLAGS_TO_PASS) \
$(POSTSTAGE1_FLAGS_TO_PASS) \
- && \
- $(STAMP) ../all-stage3-binutils
+
@endif binutils-bootstrap
+.PHONY: configure-stage3-gas maybe-configure-stage3-gas
+.PHONY: all-stage3-gas maybe-all-stage3-gas
+
maybe-configure-stage3-gas:
maybe-all-stage3-gas:
@if gas-bootstrap
maybe-configure-stage3-gas: configure-stage3-gas
-configure-stage3-gas: maybe-all-stage2-gas
- $(MAKE) stage3-start
- @if [ -f stage3-gas/Makefile ] ; then \
- $(STAMP) configure-stage3-gas ; \
- exit 0; \
- else \
- true ; \
- fi ; \
+configure-stage3-gas:
+ @$(MAKE) stage3-start
+ @[ -f gas/Makefile ] && exit 0 || : ; \
r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(STAGE_HOST_EXPORTS) \
@@ -29819,35 +29674,31 @@ configure-stage3-gas: maybe-all-stage2-gas
esac; \
$(SHELL) $${libsrcdir}/configure \
$(HOST_CONFIGARGS) $${srcdiroption} \
- @stage2_werror_flag@ && \
- $(STAMP) ../configure-stage3-gas
+ @stage2_werror_flag@
maybe-all-stage3-gas: all-stage3-gas
all-stage3-gas: configure-stage3-gas
- $(MAKE) stage3-start
+ @$(MAKE) stage3-start
@r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(STAGE_HOST_EXPORTS) \
cd gas && \
$(MAKE) $(FLAGS_TO_PASS) \
$(POSTSTAGE1_FLAGS_TO_PASS) \
- && \
- $(STAMP) ../all-stage3-gas
+
@endif gas-bootstrap
+.PHONY: configure-stage3-gcc maybe-configure-stage3-gcc
+.PHONY: all-stage3-gcc maybe-all-stage3-gcc
+
maybe-configure-stage3-gcc:
maybe-all-stage3-gcc:
@if gcc-bootstrap
maybe-configure-stage3-gcc: configure-stage3-gcc
-configure-stage3-gcc: maybe-all-stage2-gcc
- $(MAKE) stage3-start
- @if [ -f stage3-gcc/Makefile ] ; then \
- $(STAMP) configure-stage3-gcc ; \
- exit 0; \
- else \
- true ; \
- fi ; \
+configure-stage3-gcc:
+ @$(MAKE) stage3-start
+ @[ -f gcc/Makefile ] && exit 0 || : ; \
r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(STAGE_HOST_EXPORTS) \
@@ -29866,35 +29717,31 @@ configure-stage3-gcc: maybe-all-stage2-gcc
esac; \
$(SHELL) $${libsrcdir}/configure \
$(HOST_CONFIGARGS) $${srcdiroption} \
- @stage2_werror_flag@ && \
- $(STAMP) ../configure-stage3-gcc
+ @stage2_werror_flag@
maybe-all-stage3-gcc: all-stage3-gcc
all-stage3-gcc: configure-stage3-gcc
- $(MAKE) stage3-start
+ @$(MAKE) stage3-start
@r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(STAGE_HOST_EXPORTS) \
cd gcc && \
$(MAKE) $(FLAGS_TO_PASS) \
$(POSTSTAGE1_FLAGS_TO_PASS) \
- $(EXTRA_GCC_FLAGS) && \
- $(STAMP) ../all-stage3-gcc
+ $(EXTRA_GCC_FLAGS)
@endif gcc-bootstrap
+.PHONY: configure-stage3-intl maybe-configure-stage3-intl
+.PHONY: all-stage3-intl maybe-all-stage3-intl
+
maybe-configure-stage3-intl:
maybe-all-stage3-intl:
@if intl-bootstrap
maybe-configure-stage3-intl: configure-stage3-intl
-configure-stage3-intl: maybe-all-stage2-intl
- $(MAKE) stage3-start
- @if [ -f stage3-intl/Makefile ] ; then \
- $(STAMP) configure-stage3-intl ; \
- exit 0; \
- else \
- true ; \
- fi ; \
+configure-stage3-intl:
+ @$(MAKE) stage3-start
+ @[ -f intl/Makefile ] && exit 0 || : ; \
r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(STAGE_HOST_EXPORTS) \
@@ -29913,35 +29760,31 @@ configure-stage3-intl: maybe-all-stage2-intl
esac; \
$(SHELL) $${libsrcdir}/configure \
$(HOST_CONFIGARGS) $${srcdiroption} \
- @stage2_werror_flag@ && \
- $(STAMP) ../configure-stage3-intl
+ @stage2_werror_flag@
maybe-all-stage3-intl: all-stage3-intl
all-stage3-intl: configure-stage3-intl
- $(MAKE) stage3-start
+ @$(MAKE) stage3-start
@r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(STAGE_HOST_EXPORTS) \
cd intl && \
$(MAKE) $(FLAGS_TO_PASS) \
$(POSTSTAGE1_FLAGS_TO_PASS) \
- && \
- $(STAMP) ../all-stage3-intl
+
@endif intl-bootstrap
+.PHONY: configure-stage3-ld maybe-configure-stage3-ld
+.PHONY: all-stage3-ld maybe-all-stage3-ld
+
maybe-configure-stage3-ld:
maybe-all-stage3-ld:
@if ld-bootstrap
maybe-configure-stage3-ld: configure-stage3-ld
-configure-stage3-ld: maybe-all-stage2-ld
- $(MAKE) stage3-start
- @if [ -f stage3-ld/Makefile ] ; then \
- $(STAMP) configure-stage3-ld ; \
- exit 0; \
- else \
- true ; \
- fi ; \
+configure-stage3-ld:
+ @$(MAKE) stage3-start
+ @[ -f ld/Makefile ] && exit 0 || : ; \
r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(STAGE_HOST_EXPORTS) \
@@ -29960,35 +29803,31 @@ configure-stage3-ld: maybe-all-stage2-ld
esac; \
$(SHELL) $${libsrcdir}/configure \
$(HOST_CONFIGARGS) $${srcdiroption} \
- @stage2_werror_flag@ && \
- $(STAMP) ../configure-stage3-ld
+ @stage2_werror_flag@
maybe-all-stage3-ld: all-stage3-ld
all-stage3-ld: configure-stage3-ld
- $(MAKE) stage3-start
+ @$(MAKE) stage3-start
@r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(STAGE_HOST_EXPORTS) \
cd ld && \
$(MAKE) $(FLAGS_TO_PASS) \
$(POSTSTAGE1_FLAGS_TO_PASS) \
- && \
- $(STAMP) ../all-stage3-ld
+
@endif ld-bootstrap
+.PHONY: configure-stage3-libcpp maybe-configure-stage3-libcpp
+.PHONY: all-stage3-libcpp maybe-all-stage3-libcpp
+
maybe-configure-stage3-libcpp:
maybe-all-stage3-libcpp:
@if libcpp-bootstrap
maybe-configure-stage3-libcpp: configure-stage3-libcpp
-configure-stage3-libcpp: maybe-all-stage2-libcpp
- $(MAKE) stage3-start
- @if [ -f stage3-libcpp/Makefile ] ; then \
- $(STAMP) configure-stage3-libcpp ; \
- exit 0; \
- else \
- true ; \
- fi ; \
+configure-stage3-libcpp:
+ @$(MAKE) stage3-start
+ @[ -f libcpp/Makefile ] && exit 0 || : ; \
r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(STAGE_HOST_EXPORTS) \
@@ -30007,35 +29846,31 @@ configure-stage3-libcpp: maybe-all-stage2-libcpp
esac; \
$(SHELL) $${libsrcdir}/configure \
$(HOST_CONFIGARGS) $${srcdiroption} \
- @stage2_werror_flag@ && \
- $(STAMP) ../configure-stage3-libcpp
+ @stage2_werror_flag@
maybe-all-stage3-libcpp: all-stage3-libcpp
all-stage3-libcpp: configure-stage3-libcpp
- $(MAKE) stage3-start
+ @$(MAKE) stage3-start
@r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(STAGE_HOST_EXPORTS) \
cd libcpp && \
$(MAKE) $(FLAGS_TO_PASS) \
$(POSTSTAGE1_FLAGS_TO_PASS) \
- && \
- $(STAMP) ../all-stage3-libcpp
+
@endif libcpp-bootstrap
+.PHONY: configure-stage3-libbanshee maybe-configure-stage3-libbanshee
+.PHONY: all-stage3-libbanshee maybe-all-stage3-libbanshee
+
maybe-configure-stage3-libbanshee:
maybe-all-stage3-libbanshee:
@if libbanshee-bootstrap
maybe-configure-stage3-libbanshee: configure-stage3-libbanshee
-configure-stage3-libbanshee: maybe-all-stage2-libbanshee
- $(MAKE) stage3-start
- @if [ -f stage3-libbanshee/Makefile ] ; then \
- $(STAMP) configure-stage3-libbanshee ; \
- exit 0; \
- else \
- true ; \
- fi ; \
+configure-stage3-libbanshee:
+ @$(MAKE) stage3-start
+ @[ -f libbanshee/Makefile ] && exit 0 || : ; \
r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(STAGE_HOST_EXPORTS) \
@@ -30054,35 +29889,31 @@ configure-stage3-libbanshee: maybe-all-stage2-libbanshee
esac; \
$(SHELL) $${libsrcdir}/configure \
$(HOST_CONFIGARGS) $${srcdiroption} \
- @stage2_werror_flag@ && \
- $(STAMP) ../configure-stage3-libbanshee
+ @stage2_werror_flag@
maybe-all-stage3-libbanshee: all-stage3-libbanshee
all-stage3-libbanshee: configure-stage3-libbanshee
- $(MAKE) stage3-start
+ @$(MAKE) stage3-start
@r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(STAGE_HOST_EXPORTS) \
cd libbanshee && \
$(MAKE) $(FLAGS_TO_PASS) \
$(POSTSTAGE1_FLAGS_TO_PASS) \
- && \
- $(STAMP) ../all-stage3-libbanshee
+
@endif libbanshee-bootstrap
+.PHONY: configure-stage3-libiberty maybe-configure-stage3-libiberty
+.PHONY: all-stage3-libiberty maybe-all-stage3-libiberty
+
maybe-configure-stage3-libiberty:
maybe-all-stage3-libiberty:
@if libiberty-bootstrap
maybe-configure-stage3-libiberty: configure-stage3-libiberty
-configure-stage3-libiberty: maybe-all-stage2-libiberty
- $(MAKE) stage3-start
- @if [ -f stage3-libiberty/Makefile ] ; then \
- $(STAMP) configure-stage3-libiberty ; \
- exit 0; \
- else \
- true ; \
- fi ; \
+configure-stage3-libiberty:
+ @$(MAKE) stage3-start
+ @[ -f libiberty/Makefile ] && exit 0 || : ; \
r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(STAGE_HOST_EXPORTS) \
@@ -30101,35 +29932,31 @@ configure-stage3-libiberty: maybe-all-stage2-libiberty
esac; \
$(SHELL) $${libsrcdir}/configure \
$(HOST_CONFIGARGS) $${srcdiroption} \
- @stage2_werror_flag@ && \
- $(STAMP) ../configure-stage3-libiberty
+ @stage2_werror_flag@
maybe-all-stage3-libiberty: all-stage3-libiberty
all-stage3-libiberty: configure-stage3-libiberty
- $(MAKE) stage3-start
+ @$(MAKE) stage3-start
@r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(STAGE_HOST_EXPORTS) \
cd libiberty && \
$(MAKE) $(FLAGS_TO_PASS) \
$(POSTSTAGE1_FLAGS_TO_PASS) \
- && \
- $(STAMP) ../all-stage3-libiberty
+
@endif libiberty-bootstrap
+.PHONY: configure-stage3-zlib maybe-configure-stage3-zlib
+.PHONY: all-stage3-zlib maybe-all-stage3-zlib
+
maybe-configure-stage3-zlib:
maybe-all-stage3-zlib:
@if zlib-bootstrap
maybe-configure-stage3-zlib: configure-stage3-zlib
-configure-stage3-zlib: maybe-all-stage2-zlib
- $(MAKE) stage3-start
- @if [ -f stage3-zlib/Makefile ] ; then \
- $(STAMP) configure-stage3-zlib ; \
- exit 0; \
- else \
- true ; \
- fi ; \
+configure-stage3-zlib:
+ @$(MAKE) stage3-start
+ @[ -f zlib/Makefile ] && exit 0 || : ; \
r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(STAGE_HOST_EXPORTS) \
@@ -30148,20 +29975,18 @@ configure-stage3-zlib: maybe-all-stage2-zlib
esac; \
$(SHELL) $${libsrcdir}/configure \
$(HOST_CONFIGARGS) $${srcdiroption} \
- @stage2_werror_flag@ && \
- $(STAMP) ../configure-stage3-zlib
+ @stage2_werror_flag@
maybe-all-stage3-zlib: all-stage3-zlib
all-stage3-zlib: configure-stage3-zlib
- $(MAKE) stage3-start
+ @$(MAKE) stage3-start
@r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(STAGE_HOST_EXPORTS) \
cd zlib && \
$(MAKE) $(FLAGS_TO_PASS) \
$(POSTSTAGE1_FLAGS_TO_PASS) \
- && \
- $(STAMP) ../all-stage3-zlib
+
@endif zlib-bootstrap
@@ -30169,8 +29994,12 @@ all-stage3-zlib: configure-stage3-zlib
# only possibility, but now it conflicts with no-bootstrap rules
@if gcc-bootstrap
-compare: all-stage3-gcc
- [ -f stage_current ] && $(MAKE) `cat stage_current`-end || :
+compare:
+ @if test -f stage2-lean; then \
+ echo Cannot compare object files as stage 2 was deleted. ; \
+ exit 0 ; \
+ fi; \
+ [ -f stage_current ] && $(MAKE) `cat stage_current`-end || : ; \
@r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
rm -f .bad_compare ; \
@@ -30190,42 +30019,21 @@ compare: all-stage3-gcc
true; \
fi ; \
$(STAMP) compare
+ @bootstrap_lean@-rm -rf stage2-* ; $(STAMP) stage2-lean
.PHONY: bootstrap
-bootstrap: stage3-bubble compare all
+bootstrap: stage3-bubble compare all
-.PHONY: restage3 touch-stage3 distclean-stage3
+.PHONY: distclean-stage3
# Rules to wipe a stage and all the following ones, used for cleanstrap
distclean-stage2:: distclean-stage3
distclean-stage3::
[ -f stage_current ] && $(MAKE) `cat stage_current`-end || :
- rm -rf configure-stage3-* all-stage3-* stage3-* compare
-
-# Rules to renew the timestamp on a stage and all the following ones
-touch-stage2:: touch-stage3
-touch-stage3::
- @case `echo configure-stage3-*` in \
- 'configure-stage3-*') ;; \
- *) \
- echo '$(STAMP)' configure-stage3-* && \
- $(STAMP) configure-stage3-* ;; \
- esac ; \
- case `echo all-stage3-*` in \
- 'all-stage3-*') ;; \
- *) \
- echo '$(STAMP)' all-stage3-* && \
- $(STAMP) all-stage3-* ;; \
- esac
-
-# After building a stage, touch the following ones
-restage2:: touch-stage3
-restage3::
- rm -rf all-stage3-* compare
- $(MAKE) $(RECURSE_FLAGS_TO_PASS) compare
+ rm -rf stage3-* compare
.PHONY: cleanstrap
@@ -30237,109 +30045,109 @@ cleanstrap: distclean-stage1 bootstrap
.PHONY: stage4-start stage4-end
stage4-start::
- [ -f stage_current ] && $(MAKE) `cat stage_current`-end || :
+ @[ -f stage_current ] && $(MAKE) `cat stage_current`-end || : ; \
echo stage4 > stage_current ; \
echo stage4 > stage_last
@if bfd
- [ -d stage4-bfd ] || mkdir stage4-bfd; \
+ @[ -d stage4-bfd ] || mkdir stage4-bfd; \
set stage4-bfd bfd ; @CREATE_LINK_TO_DIR@ ; \
set stage3-bfd prev-bfd ; @CREATE_LINK_TO_DIR@
@endif bfd
@if opcodes
- [ -d stage4-opcodes ] || mkdir stage4-opcodes; \
+ @[ -d stage4-opcodes ] || mkdir stage4-opcodes; \
set stage4-opcodes opcodes ; @CREATE_LINK_TO_DIR@ ; \
set stage3-opcodes prev-opcodes ; @CREATE_LINK_TO_DIR@
@endif opcodes
@if binutils
- [ -d stage4-binutils ] || mkdir stage4-binutils; \
+ @[ -d stage4-binutils ] || mkdir stage4-binutils; \
set stage4-binutils binutils ; @CREATE_LINK_TO_DIR@ ; \
set stage3-binutils prev-binutils ; @CREATE_LINK_TO_DIR@
@endif binutils
@if gas
- [ -d stage4-gas ] || mkdir stage4-gas; \
+ @[ -d stage4-gas ] || mkdir stage4-gas; \
set stage4-gas gas ; @CREATE_LINK_TO_DIR@ ; \
set stage3-gas prev-gas ; @CREATE_LINK_TO_DIR@
@endif gas
@if gcc
- [ -d stage4-gcc ] || mkdir stage4-gcc; \
+ @[ -d stage4-gcc ] || mkdir stage4-gcc; \
set stage4-gcc gcc ; @CREATE_LINK_TO_DIR@ ; \
set stage3-gcc prev-gcc ; @CREATE_LINK_TO_DIR@
@endif gcc
@if intl
- [ -d stage4-intl ] || mkdir stage4-intl; \
+ @[ -d stage4-intl ] || mkdir stage4-intl; \
set stage4-intl intl ; @CREATE_LINK_TO_DIR@ ; \
set stage3-intl prev-intl ; @CREATE_LINK_TO_DIR@
@endif intl
@if ld
- [ -d stage4-ld ] || mkdir stage4-ld; \
+ @[ -d stage4-ld ] || mkdir stage4-ld; \
set stage4-ld ld ; @CREATE_LINK_TO_DIR@ ; \
set stage3-ld prev-ld ; @CREATE_LINK_TO_DIR@
@endif ld
@if libcpp
- [ -d stage4-libcpp ] || mkdir stage4-libcpp; \
+ @[ -d stage4-libcpp ] || mkdir stage4-libcpp; \
set stage4-libcpp libcpp ; @CREATE_LINK_TO_DIR@ ; \
set stage3-libcpp prev-libcpp ; @CREATE_LINK_TO_DIR@
@endif libcpp
@if libbanshee
- [ -d stage4-libbanshee ] || mkdir stage4-libbanshee; \
+ @[ -d stage4-libbanshee ] || mkdir stage4-libbanshee; \
set stage4-libbanshee libbanshee ; @CREATE_LINK_TO_DIR@ ; \
set stage3-libbanshee prev-libbanshee ; @CREATE_LINK_TO_DIR@
@endif libbanshee
@if libiberty
- [ -d stage4-libiberty ] || mkdir stage4-libiberty; \
+ @[ -d stage4-libiberty ] || mkdir stage4-libiberty; \
set stage4-libiberty libiberty ; @CREATE_LINK_TO_DIR@ ; \
set stage3-libiberty prev-libiberty ; @CREATE_LINK_TO_DIR@
@endif libiberty
@if zlib
- [ -d stage4-zlib ] || mkdir stage4-zlib; \
+ @[ -d stage4-zlib ] || mkdir stage4-zlib; \
set stage4-zlib zlib ; @CREATE_LINK_TO_DIR@ ; \
set stage3-zlib prev-zlib ; @CREATE_LINK_TO_DIR@
@endif zlib
stage4-end::
- rm -f stage_current
+ @rm -f stage_current
@if bfd
- set bfd stage4-bfd ; @UNDO_LINK_TO_DIR@ ; \
+ @set bfd stage4-bfd ; @UNDO_LINK_TO_DIR@ ; \
set prev-bfd stage3-bfd ; @UNDO_LINK_TO_DIR@
@endif bfd
@if opcodes
- set opcodes stage4-opcodes ; @UNDO_LINK_TO_DIR@ ; \
+ @set opcodes stage4-opcodes ; @UNDO_LINK_TO_DIR@ ; \
set prev-opcodes stage3-opcodes ; @UNDO_LINK_TO_DIR@
@endif opcodes
@if binutils
- set binutils stage4-binutils ; @UNDO_LINK_TO_DIR@ ; \
+ @set binutils stage4-binutils ; @UNDO_LINK_TO_DIR@ ; \
set prev-binutils stage3-binutils ; @UNDO_LINK_TO_DIR@
@endif binutils
@if gas
- set gas stage4-gas ; @UNDO_LINK_TO_DIR@ ; \
+ @set gas stage4-gas ; @UNDO_LINK_TO_DIR@ ; \
set prev-gas stage3-gas ; @UNDO_LINK_TO_DIR@
@endif gas
@if gcc
- set gcc stage4-gcc ; @UNDO_LINK_TO_DIR@ ; \
+ @set gcc stage4-gcc ; @UNDO_LINK_TO_DIR@ ; \
set prev-gcc stage3-gcc ; @UNDO_LINK_TO_DIR@
@endif gcc
@if intl
- set intl stage4-intl ; @UNDO_LINK_TO_DIR@ ; \
+ @set intl stage4-intl ; @UNDO_LINK_TO_DIR@ ; \
set prev-intl stage3-intl ; @UNDO_LINK_TO_DIR@
@endif intl
@if ld
- set ld stage4-ld ; @UNDO_LINK_TO_DIR@ ; \
+ @set ld stage4-ld ; @UNDO_LINK_TO_DIR@ ; \
set prev-ld stage3-ld ; @UNDO_LINK_TO_DIR@
@endif ld
@if libcpp
- set libcpp stage4-libcpp ; @UNDO_LINK_TO_DIR@ ; \
+ @set libcpp stage4-libcpp ; @UNDO_LINK_TO_DIR@ ; \
set prev-libcpp stage3-libcpp ; @UNDO_LINK_TO_DIR@
@endif libcpp
@if libbanshee
- set libbanshee stage4-libbanshee ; @UNDO_LINK_TO_DIR@ ; \
+ @set libbanshee stage4-libbanshee ; @UNDO_LINK_TO_DIR@ ; \
set prev-libbanshee stage3-libbanshee ; @UNDO_LINK_TO_DIR@
@endif libbanshee
@if libiberty
- set libiberty stage4-libiberty ; @UNDO_LINK_TO_DIR@ ; \
+ @set libiberty stage4-libiberty ; @UNDO_LINK_TO_DIR@ ; \
set prev-libiberty stage3-libiberty ; @UNDO_LINK_TO_DIR@
@endif libiberty
@if zlib
- set zlib stage4-zlib ; @UNDO_LINK_TO_DIR@ ; \
+ @set zlib stage4-zlib ; @UNDO_LINK_TO_DIR@ ; \
set prev-zlib stage3-zlib ; @UNDO_LINK_TO_DIR@
@endif zlib
@@ -30348,11 +30156,12 @@ stage4-end::
# be reconfigured as well.
.PHONY: stage4-bubble
stage4-bubble:: stage3-bubble
- @case `echo all-stage4-*` in \
- 'all-stage4-*') ;; \
- *) echo Remaking stage 4 ; rm -f all-stage4-* ;; \
- esac ; \
- $(MAKE) $(RECURSE_FLAGS_TO_PASS) all-stage4
+ @bootstrap_lean@-rm -rf stage2-* ; $(STAMP) stage2-lean
+ @if test -f stage4-lean || test -f stage3-lean ; then \
+ echo Skipping rebuild of stage4 ; \
+ else \
+ $(MAKE) $(RECURSE_FLAGS_TO_PASS) all-stage4; \
+ fi
.PHONY: all-stage4
all-stage4: \
@@ -30369,19 +30178,17 @@ all-stage4: \
maybe-all-stage4-zlib
+.PHONY: configure-stage4-bfd maybe-configure-stage4-bfd
+.PHONY: all-stage4-bfd maybe-all-stage4-bfd
+
maybe-configure-stage4-bfd:
maybe-all-stage4-bfd:
@if bfd-bootstrap
maybe-configure-stage4-bfd: configure-stage4-bfd
-configure-stage4-bfd: maybe-all-stage3-bfd
- $(MAKE) stage4-start
- @if [ -f stage4-bfd/Makefile ] ; then \
- $(STAMP) configure-stage4-bfd ; \
- exit 0; \
- else \
- true ; \
- fi ; \
+configure-stage4-bfd:
+ @$(MAKE) stage4-start
+ @[ -f bfd/Makefile ] && exit 0 || : ; \
r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(STAGE_HOST_EXPORTS) \
@@ -30400,35 +30207,31 @@ configure-stage4-bfd: maybe-all-stage3-bfd
esac; \
$(SHELL) $${libsrcdir}/configure \
$(HOST_CONFIGARGS) $${srcdiroption} \
- @stage2_werror_flag@ && \
- $(STAMP) ../configure-stage4-bfd
+ @stage2_werror_flag@
maybe-all-stage4-bfd: all-stage4-bfd
all-stage4-bfd: configure-stage4-bfd
- $(MAKE) stage4-start
+ @$(MAKE) stage4-start
@r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(STAGE_HOST_EXPORTS) \
cd bfd && \
$(MAKE) $(FLAGS_TO_PASS) \
$(POSTSTAGE1_FLAGS_TO_PASS) \
- && \
- $(STAMP) ../all-stage4-bfd
+
@endif bfd-bootstrap
+.PHONY: configure-stage4-opcodes maybe-configure-stage4-opcodes
+.PHONY: all-stage4-opcodes maybe-all-stage4-opcodes
+
maybe-configure-stage4-opcodes:
maybe-all-stage4-opcodes:
@if opcodes-bootstrap
maybe-configure-stage4-opcodes: configure-stage4-opcodes
-configure-stage4-opcodes: maybe-all-stage3-opcodes
- $(MAKE) stage4-start
- @if [ -f stage4-opcodes/Makefile ] ; then \
- $(STAMP) configure-stage4-opcodes ; \
- exit 0; \
- else \
- true ; \
- fi ; \
+configure-stage4-opcodes:
+ @$(MAKE) stage4-start
+ @[ -f opcodes/Makefile ] && exit 0 || : ; \
r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(STAGE_HOST_EXPORTS) \
@@ -30447,35 +30250,31 @@ configure-stage4-opcodes: maybe-all-stage3-opcodes
esac; \
$(SHELL) $${libsrcdir}/configure \
$(HOST_CONFIGARGS) $${srcdiroption} \
- @stage2_werror_flag@ && \
- $(STAMP) ../configure-stage4-opcodes
+ @stage2_werror_flag@
maybe-all-stage4-opcodes: all-stage4-opcodes
all-stage4-opcodes: configure-stage4-opcodes
- $(MAKE) stage4-start
+ @$(MAKE) stage4-start
@r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(STAGE_HOST_EXPORTS) \
cd opcodes && \
$(MAKE) $(FLAGS_TO_PASS) \
$(POSTSTAGE1_FLAGS_TO_PASS) \
- && \
- $(STAMP) ../all-stage4-opcodes
+
@endif opcodes-bootstrap
+.PHONY: configure-stage4-binutils maybe-configure-stage4-binutils
+.PHONY: all-stage4-binutils maybe-all-stage4-binutils
+
maybe-configure-stage4-binutils:
maybe-all-stage4-binutils:
@if binutils-bootstrap
maybe-configure-stage4-binutils: configure-stage4-binutils
-configure-stage4-binutils: maybe-all-stage3-binutils
- $(MAKE) stage4-start
- @if [ -f stage4-binutils/Makefile ] ; then \
- $(STAMP) configure-stage4-binutils ; \
- exit 0; \
- else \
- true ; \
- fi ; \
+configure-stage4-binutils:
+ @$(MAKE) stage4-start
+ @[ -f binutils/Makefile ] && exit 0 || : ; \
r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(STAGE_HOST_EXPORTS) \
@@ -30494,35 +30293,31 @@ configure-stage4-binutils: maybe-all-stage3-binutils
esac; \
$(SHELL) $${libsrcdir}/configure \
$(HOST_CONFIGARGS) $${srcdiroption} \
- @stage2_werror_flag@ && \
- $(STAMP) ../configure-stage4-binutils
+ @stage2_werror_flag@
maybe-all-stage4-binutils: all-stage4-binutils
all-stage4-binutils: configure-stage4-binutils
- $(MAKE) stage4-start
+ @$(MAKE) stage4-start
@r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(STAGE_HOST_EXPORTS) \
cd binutils && \
$(MAKE) $(FLAGS_TO_PASS) \
$(POSTSTAGE1_FLAGS_TO_PASS) \
- && \
- $(STAMP) ../all-stage4-binutils
+
@endif binutils-bootstrap
+.PHONY: configure-stage4-gas maybe-configure-stage4-gas
+.PHONY: all-stage4-gas maybe-all-stage4-gas
+
maybe-configure-stage4-gas:
maybe-all-stage4-gas:
@if gas-bootstrap
maybe-configure-stage4-gas: configure-stage4-gas
-configure-stage4-gas: maybe-all-stage3-gas
- $(MAKE) stage4-start
- @if [ -f stage4-gas/Makefile ] ; then \
- $(STAMP) configure-stage4-gas ; \
- exit 0; \
- else \
- true ; \
- fi ; \
+configure-stage4-gas:
+ @$(MAKE) stage4-start
+ @[ -f gas/Makefile ] && exit 0 || : ; \
r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(STAGE_HOST_EXPORTS) \
@@ -30541,35 +30336,31 @@ configure-stage4-gas: maybe-all-stage3-gas
esac; \
$(SHELL) $${libsrcdir}/configure \
$(HOST_CONFIGARGS) $${srcdiroption} \
- @stage2_werror_flag@ && \
- $(STAMP) ../configure-stage4-gas
+ @stage2_werror_flag@
maybe-all-stage4-gas: all-stage4-gas
all-stage4-gas: configure-stage4-gas
- $(MAKE) stage4-start
+ @$(MAKE) stage4-start
@r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(STAGE_HOST_EXPORTS) \
cd gas && \
$(MAKE) $(FLAGS_TO_PASS) \
$(POSTSTAGE1_FLAGS_TO_PASS) \
- && \
- $(STAMP) ../all-stage4-gas
+
@endif gas-bootstrap
+.PHONY: configure-stage4-gcc maybe-configure-stage4-gcc
+.PHONY: all-stage4-gcc maybe-all-stage4-gcc
+
maybe-configure-stage4-gcc:
maybe-all-stage4-gcc:
@if gcc-bootstrap
maybe-configure-stage4-gcc: configure-stage4-gcc
-configure-stage4-gcc: maybe-all-stage3-gcc
- $(MAKE) stage4-start
- @if [ -f stage4-gcc/Makefile ] ; then \
- $(STAMP) configure-stage4-gcc ; \
- exit 0; \
- else \
- true ; \
- fi ; \
+configure-stage4-gcc:
+ @$(MAKE) stage4-start
+ @[ -f gcc/Makefile ] && exit 0 || : ; \
r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(STAGE_HOST_EXPORTS) \
@@ -30588,35 +30379,31 @@ configure-stage4-gcc: maybe-all-stage3-gcc
esac; \
$(SHELL) $${libsrcdir}/configure \
$(HOST_CONFIGARGS) $${srcdiroption} \
- @stage2_werror_flag@ && \
- $(STAMP) ../configure-stage4-gcc
+ @stage2_werror_flag@
maybe-all-stage4-gcc: all-stage4-gcc
all-stage4-gcc: configure-stage4-gcc
- $(MAKE) stage4-start
+ @$(MAKE) stage4-start
@r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(STAGE_HOST_EXPORTS) \
cd gcc && \
$(MAKE) $(FLAGS_TO_PASS) \
$(POSTSTAGE1_FLAGS_TO_PASS) \
- $(EXTRA_GCC_FLAGS) && \
- $(STAMP) ../all-stage4-gcc
+ $(EXTRA_GCC_FLAGS)
@endif gcc-bootstrap
+.PHONY: configure-stage4-intl maybe-configure-stage4-intl
+.PHONY: all-stage4-intl maybe-all-stage4-intl
+
maybe-configure-stage4-intl:
maybe-all-stage4-intl:
@if intl-bootstrap
maybe-configure-stage4-intl: configure-stage4-intl
-configure-stage4-intl: maybe-all-stage3-intl
- $(MAKE) stage4-start
- @if [ -f stage4-intl/Makefile ] ; then \
- $(STAMP) configure-stage4-intl ; \
- exit 0; \
- else \
- true ; \
- fi ; \
+configure-stage4-intl:
+ @$(MAKE) stage4-start
+ @[ -f intl/Makefile ] && exit 0 || : ; \
r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(STAGE_HOST_EXPORTS) \
@@ -30635,35 +30422,31 @@ configure-stage4-intl: maybe-all-stage3-intl
esac; \
$(SHELL) $${libsrcdir}/configure \
$(HOST_CONFIGARGS) $${srcdiroption} \
- @stage2_werror_flag@ && \
- $(STAMP) ../configure-stage4-intl
+ @stage2_werror_flag@
maybe-all-stage4-intl: all-stage4-intl
all-stage4-intl: configure-stage4-intl
- $(MAKE) stage4-start
+ @$(MAKE) stage4-start
@r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(STAGE_HOST_EXPORTS) \
cd intl && \
$(MAKE) $(FLAGS_TO_PASS) \
$(POSTSTAGE1_FLAGS_TO_PASS) \
- && \
- $(STAMP) ../all-stage4-intl
+
@endif intl-bootstrap
+.PHONY: configure-stage4-ld maybe-configure-stage4-ld
+.PHONY: all-stage4-ld maybe-all-stage4-ld
+
maybe-configure-stage4-ld:
maybe-all-stage4-ld:
@if ld-bootstrap
maybe-configure-stage4-ld: configure-stage4-ld
-configure-stage4-ld: maybe-all-stage3-ld
- $(MAKE) stage4-start
- @if [ -f stage4-ld/Makefile ] ; then \
- $(STAMP) configure-stage4-ld ; \
- exit 0; \
- else \
- true ; \
- fi ; \
+configure-stage4-ld:
+ @$(MAKE) stage4-start
+ @[ -f ld/Makefile ] && exit 0 || : ; \
r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(STAGE_HOST_EXPORTS) \
@@ -30682,35 +30465,31 @@ configure-stage4-ld: maybe-all-stage3-ld
esac; \
$(SHELL) $${libsrcdir}/configure \
$(HOST_CONFIGARGS) $${srcdiroption} \
- @stage2_werror_flag@ && \
- $(STAMP) ../configure-stage4-ld
+ @stage2_werror_flag@
maybe-all-stage4-ld: all-stage4-ld
all-stage4-ld: configure-stage4-ld
- $(MAKE) stage4-start
+ @$(MAKE) stage4-start
@r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(STAGE_HOST_EXPORTS) \
cd ld && \
$(MAKE) $(FLAGS_TO_PASS) \
$(POSTSTAGE1_FLAGS_TO_PASS) \
- && \
- $(STAMP) ../all-stage4-ld
+
@endif ld-bootstrap
+.PHONY: configure-stage4-libcpp maybe-configure-stage4-libcpp
+.PHONY: all-stage4-libcpp maybe-all-stage4-libcpp
+
maybe-configure-stage4-libcpp:
maybe-all-stage4-libcpp:
@if libcpp-bootstrap
maybe-configure-stage4-libcpp: configure-stage4-libcpp
-configure-stage4-libcpp: maybe-all-stage3-libcpp
- $(MAKE) stage4-start
- @if [ -f stage4-libcpp/Makefile ] ; then \
- $(STAMP) configure-stage4-libcpp ; \
- exit 0; \
- else \
- true ; \
- fi ; \
+configure-stage4-libcpp:
+ @$(MAKE) stage4-start
+ @[ -f libcpp/Makefile ] && exit 0 || : ; \
r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(STAGE_HOST_EXPORTS) \
@@ -30729,35 +30508,31 @@ configure-stage4-libcpp: maybe-all-stage3-libcpp
esac; \
$(SHELL) $${libsrcdir}/configure \
$(HOST_CONFIGARGS) $${srcdiroption} \
- @stage2_werror_flag@ && \
- $(STAMP) ../configure-stage4-libcpp
+ @stage2_werror_flag@
maybe-all-stage4-libcpp: all-stage4-libcpp
all-stage4-libcpp: configure-stage4-libcpp
- $(MAKE) stage4-start
+ @$(MAKE) stage4-start
@r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(STAGE_HOST_EXPORTS) \
cd libcpp && \
$(MAKE) $(FLAGS_TO_PASS) \
$(POSTSTAGE1_FLAGS_TO_PASS) \
- && \
- $(STAMP) ../all-stage4-libcpp
+
@endif libcpp-bootstrap
+.PHONY: configure-stage4-libbanshee maybe-configure-stage4-libbanshee
+.PHONY: all-stage4-libbanshee maybe-all-stage4-libbanshee
+
maybe-configure-stage4-libbanshee:
maybe-all-stage4-libbanshee:
@if libbanshee-bootstrap
maybe-configure-stage4-libbanshee: configure-stage4-libbanshee
-configure-stage4-libbanshee: maybe-all-stage3-libbanshee
- $(MAKE) stage4-start
- @if [ -f stage4-libbanshee/Makefile ] ; then \
- $(STAMP) configure-stage4-libbanshee ; \
- exit 0; \
- else \
- true ; \
- fi ; \
+configure-stage4-libbanshee:
+ @$(MAKE) stage4-start
+ @[ -f libbanshee/Makefile ] && exit 0 || : ; \
r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(STAGE_HOST_EXPORTS) \
@@ -30776,35 +30551,31 @@ configure-stage4-libbanshee: maybe-all-stage3-libbanshee
esac; \
$(SHELL) $${libsrcdir}/configure \
$(HOST_CONFIGARGS) $${srcdiroption} \
- @stage2_werror_flag@ && \
- $(STAMP) ../configure-stage4-libbanshee
+ @stage2_werror_flag@
maybe-all-stage4-libbanshee: all-stage4-libbanshee
all-stage4-libbanshee: configure-stage4-libbanshee
- $(MAKE) stage4-start
+ @$(MAKE) stage4-start
@r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(STAGE_HOST_EXPORTS) \
cd libbanshee && \
$(MAKE) $(FLAGS_TO_PASS) \
$(POSTSTAGE1_FLAGS_TO_PASS) \
- && \
- $(STAMP) ../all-stage4-libbanshee
+
@endif libbanshee-bootstrap
+.PHONY: configure-stage4-libiberty maybe-configure-stage4-libiberty
+.PHONY: all-stage4-libiberty maybe-all-stage4-libiberty
+
maybe-configure-stage4-libiberty:
maybe-all-stage4-libiberty:
@if libiberty-bootstrap
maybe-configure-stage4-libiberty: configure-stage4-libiberty
-configure-stage4-libiberty: maybe-all-stage3-libiberty
- $(MAKE) stage4-start
- @if [ -f stage4-libiberty/Makefile ] ; then \
- $(STAMP) configure-stage4-libiberty ; \
- exit 0; \
- else \
- true ; \
- fi ; \
+configure-stage4-libiberty:
+ @$(MAKE) stage4-start
+ @[ -f libiberty/Makefile ] && exit 0 || : ; \
r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(STAGE_HOST_EXPORTS) \
@@ -30823,35 +30594,31 @@ configure-stage4-libiberty: maybe-all-stage3-libiberty
esac; \
$(SHELL) $${libsrcdir}/configure \
$(HOST_CONFIGARGS) $${srcdiroption} \
- @stage2_werror_flag@ && \
- $(STAMP) ../configure-stage4-libiberty
+ @stage2_werror_flag@
maybe-all-stage4-libiberty: all-stage4-libiberty
all-stage4-libiberty: configure-stage4-libiberty
- $(MAKE) stage4-start
+ @$(MAKE) stage4-start
@r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(STAGE_HOST_EXPORTS) \
cd libiberty && \
$(MAKE) $(FLAGS_TO_PASS) \
$(POSTSTAGE1_FLAGS_TO_PASS) \
- && \
- $(STAMP) ../all-stage4-libiberty
+
@endif libiberty-bootstrap
+.PHONY: configure-stage4-zlib maybe-configure-stage4-zlib
+.PHONY: all-stage4-zlib maybe-all-stage4-zlib
+
maybe-configure-stage4-zlib:
maybe-all-stage4-zlib:
@if zlib-bootstrap
maybe-configure-stage4-zlib: configure-stage4-zlib
-configure-stage4-zlib: maybe-all-stage3-zlib
- $(MAKE) stage4-start
- @if [ -f stage4-zlib/Makefile ] ; then \
- $(STAMP) configure-stage4-zlib ; \
- exit 0; \
- else \
- true ; \
- fi ; \
+configure-stage4-zlib:
+ @$(MAKE) stage4-start
+ @[ -f zlib/Makefile ] && exit 0 || : ; \
r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(STAGE_HOST_EXPORTS) \
@@ -30870,20 +30637,18 @@ configure-stage4-zlib: maybe-all-stage3-zlib
esac; \
$(SHELL) $${libsrcdir}/configure \
$(HOST_CONFIGARGS) $${srcdiroption} \
- @stage2_werror_flag@ && \
- $(STAMP) ../configure-stage4-zlib
+ @stage2_werror_flag@
maybe-all-stage4-zlib: all-stage4-zlib
all-stage4-zlib: configure-stage4-zlib
- $(MAKE) stage4-start
+ @$(MAKE) stage4-start
@r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(STAGE_HOST_EXPORTS) \
cd zlib && \
$(MAKE) $(FLAGS_TO_PASS) \
$(POSTSTAGE1_FLAGS_TO_PASS) \
- && \
- $(STAMP) ../all-stage4-zlib
+
@endif zlib-bootstrap
@@ -30891,8 +30656,12 @@ all-stage4-zlib: configure-stage4-zlib
# only possibility, but now it conflicts with no-bootstrap rules
@if gcc-bootstrap
-compare3: all-stage4-gcc
- [ -f stage_current ] && $(MAKE) `cat stage_current`-end || :
+compare3:
+ @if test -f stage3-lean; then \
+ echo Cannot compare object files as stage 3 was deleted. ; \
+ exit 0 ; \
+ fi; \
+ [ -f stage_current ] && $(MAKE) `cat stage_current`-end || : ; \
@r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
rm -f .bad_compare ; \
@@ -30912,42 +30681,21 @@ compare3: all-stage4-gcc
true; \
fi ; \
$(STAMP) compare3
+ @bootstrap_lean@-rm -rf stage3-* ; $(STAMP) stage3-lean
.PHONY: bootstrap4
-bootstrap4: stage4-bubble compare3 all
+bootstrap4: stage4-bubble compare3 all
-.PHONY: restage4 touch-stage4 distclean-stage4
+.PHONY: distclean-stage4
# Rules to wipe a stage and all the following ones, used for cleanstrap
distclean-stage3:: distclean-stage4
distclean-stage4::
[ -f stage_current ] && $(MAKE) `cat stage_current`-end || :
- rm -rf configure-stage4-* all-stage4-* stage4-* compare3
-
-# Rules to renew the timestamp on a stage and all the following ones
-touch-stage3:: touch-stage4
-touch-stage4::
- @case `echo configure-stage4-*` in \
- 'configure-stage4-*') ;; \
- *) \
- echo '$(STAMP)' configure-stage4-* && \
- $(STAMP) configure-stage4-* ;; \
- esac ; \
- case `echo all-stage4-*` in \
- 'all-stage4-*') ;; \
- *) \
- echo '$(STAMP)' all-stage4-* && \
- $(STAMP) all-stage4-* ;; \
- esac
-
-# After building a stage, touch the following ones
-restage3:: touch-stage4
-restage4::
- rm -rf all-stage4-* compare3
- $(MAKE) $(RECURSE_FLAGS_TO_PASS) compare3
+ rm -rf stage4-* compare3
@endif gcc-bootstrap
@@ -30956,109 +30704,109 @@ restage4::
.PHONY: stageprofile-start stageprofile-end
stageprofile-start::
- [ -f stage_current ] && $(MAKE) `cat stage_current`-end || :
+ @[ -f stage_current ] && $(MAKE) `cat stage_current`-end || : ; \
echo stageprofile > stage_current ; \
echo stageprofile > stage_last
@if bfd
- [ -d stageprofile-bfd ] || mkdir stageprofile-bfd; \
+ @[ -d stageprofile-bfd ] || mkdir stageprofile-bfd; \
set stageprofile-bfd bfd ; @CREATE_LINK_TO_DIR@ ; \
set stage1-bfd prev-bfd ; @CREATE_LINK_TO_DIR@
@endif bfd
@if opcodes
- [ -d stageprofile-opcodes ] || mkdir stageprofile-opcodes; \
+ @[ -d stageprofile-opcodes ] || mkdir stageprofile-opcodes; \
set stageprofile-opcodes opcodes ; @CREATE_LINK_TO_DIR@ ; \
set stage1-opcodes prev-opcodes ; @CREATE_LINK_TO_DIR@
@endif opcodes
@if binutils
- [ -d stageprofile-binutils ] || mkdir stageprofile-binutils; \
+ @[ -d stageprofile-binutils ] || mkdir stageprofile-binutils; \
set stageprofile-binutils binutils ; @CREATE_LINK_TO_DIR@ ; \
set stage1-binutils prev-binutils ; @CREATE_LINK_TO_DIR@
@endif binutils
@if gas
- [ -d stageprofile-gas ] || mkdir stageprofile-gas; \
+ @[ -d stageprofile-gas ] || mkdir stageprofile-gas; \
set stageprofile-gas gas ; @CREATE_LINK_TO_DIR@ ; \
set stage1-gas prev-gas ; @CREATE_LINK_TO_DIR@
@endif gas
@if gcc
- [ -d stageprofile-gcc ] || mkdir stageprofile-gcc; \
+ @[ -d stageprofile-gcc ] || mkdir stageprofile-gcc; \
set stageprofile-gcc gcc ; @CREATE_LINK_TO_DIR@ ; \
set stage1-gcc prev-gcc ; @CREATE_LINK_TO_DIR@
@endif gcc
@if intl
- [ -d stageprofile-intl ] || mkdir stageprofile-intl; \
+ @[ -d stageprofile-intl ] || mkdir stageprofile-intl; \
set stageprofile-intl intl ; @CREATE_LINK_TO_DIR@ ; \
set stage1-intl prev-intl ; @CREATE_LINK_TO_DIR@
@endif intl
@if ld
- [ -d stageprofile-ld ] || mkdir stageprofile-ld; \
+ @[ -d stageprofile-ld ] || mkdir stageprofile-ld; \
set stageprofile-ld ld ; @CREATE_LINK_TO_DIR@ ; \
set stage1-ld prev-ld ; @CREATE_LINK_TO_DIR@
@endif ld
@if libcpp
- [ -d stageprofile-libcpp ] || mkdir stageprofile-libcpp; \
+ @[ -d stageprofile-libcpp ] || mkdir stageprofile-libcpp; \
set stageprofile-libcpp libcpp ; @CREATE_LINK_TO_DIR@ ; \
set stage1-libcpp prev-libcpp ; @CREATE_LINK_TO_DIR@
@endif libcpp
@if libbanshee
- [ -d stageprofile-libbanshee ] || mkdir stageprofile-libbanshee; \
+ @[ -d stageprofile-libbanshee ] || mkdir stageprofile-libbanshee; \
set stageprofile-libbanshee libbanshee ; @CREATE_LINK_TO_DIR@ ; \
set stage1-libbanshee prev-libbanshee ; @CREATE_LINK_TO_DIR@
@endif libbanshee
@if libiberty
- [ -d stageprofile-libiberty ] || mkdir stageprofile-libiberty; \
+ @[ -d stageprofile-libiberty ] || mkdir stageprofile-libiberty; \
set stageprofile-libiberty libiberty ; @CREATE_LINK_TO_DIR@ ; \
set stage1-libiberty prev-libiberty ; @CREATE_LINK_TO_DIR@
@endif libiberty
@if zlib
- [ -d stageprofile-zlib ] || mkdir stageprofile-zlib; \
+ @[ -d stageprofile-zlib ] || mkdir stageprofile-zlib; \
set stageprofile-zlib zlib ; @CREATE_LINK_TO_DIR@ ; \
set stage1-zlib prev-zlib ; @CREATE_LINK_TO_DIR@
@endif zlib
stageprofile-end::
- rm -f stage_current
+ @rm -f stage_current
@if bfd
- set bfd stageprofile-bfd ; @UNDO_LINK_TO_DIR@ ; \
+ @set bfd stageprofile-bfd ; @UNDO_LINK_TO_DIR@ ; \
set prev-bfd stage1-bfd ; @UNDO_LINK_TO_DIR@
@endif bfd
@if opcodes
- set opcodes stageprofile-opcodes ; @UNDO_LINK_TO_DIR@ ; \
+ @set opcodes stageprofile-opcodes ; @UNDO_LINK_TO_DIR@ ; \
set prev-opcodes stage1-opcodes ; @UNDO_LINK_TO_DIR@
@endif opcodes
@if binutils
- set binutils stageprofile-binutils ; @UNDO_LINK_TO_DIR@ ; \
+ @set binutils stageprofile-binutils ; @UNDO_LINK_TO_DIR@ ; \
set prev-binutils stage1-binutils ; @UNDO_LINK_TO_DIR@
@endif binutils
@if gas
- set gas stageprofile-gas ; @UNDO_LINK_TO_DIR@ ; \
+ @set gas stageprofile-gas ; @UNDO_LINK_TO_DIR@ ; \
set prev-gas stage1-gas ; @UNDO_LINK_TO_DIR@
@endif gas
@if gcc
- set gcc stageprofile-gcc ; @UNDO_LINK_TO_DIR@ ; \
+ @set gcc stageprofile-gcc ; @UNDO_LINK_TO_DIR@ ; \
set prev-gcc stage1-gcc ; @UNDO_LINK_TO_DIR@
@endif gcc
@if intl
- set intl stageprofile-intl ; @UNDO_LINK_TO_DIR@ ; \
+ @set intl stageprofile-intl ; @UNDO_LINK_TO_DIR@ ; \
set prev-intl stage1-intl ; @UNDO_LINK_TO_DIR@
@endif intl
@if ld
- set ld stageprofile-ld ; @UNDO_LINK_TO_DIR@ ; \
+ @set ld stageprofile-ld ; @UNDO_LINK_TO_DIR@ ; \
set prev-ld stage1-ld ; @UNDO_LINK_TO_DIR@
@endif ld
@if libcpp
- set libcpp stageprofile-libcpp ; @UNDO_LINK_TO_DIR@ ; \
+ @set libcpp stageprofile-libcpp ; @UNDO_LINK_TO_DIR@ ; \
set prev-libcpp stage1-libcpp ; @UNDO_LINK_TO_DIR@
@endif libcpp
@if libbanshee
- set libbanshee stageprofile-libbanshee ; @UNDO_LINK_TO_DIR@ ; \
+ @set libbanshee stageprofile-libbanshee ; @UNDO_LINK_TO_DIR@ ; \
set prev-libbanshee stage1-libbanshee ; @UNDO_LINK_TO_DIR@
@endif libbanshee
@if libiberty
- set libiberty stageprofile-libiberty ; @UNDO_LINK_TO_DIR@ ; \
+ @set libiberty stageprofile-libiberty ; @UNDO_LINK_TO_DIR@ ; \
set prev-libiberty stage1-libiberty ; @UNDO_LINK_TO_DIR@
@endif libiberty
@if zlib
- set zlib stageprofile-zlib ; @UNDO_LINK_TO_DIR@ ; \
+ @set zlib stageprofile-zlib ; @UNDO_LINK_TO_DIR@ ; \
set prev-zlib stage1-zlib ; @UNDO_LINK_TO_DIR@
@endif zlib
@@ -31067,11 +30815,11 @@ stageprofile-end::
# be reconfigured as well.
.PHONY: stageprofile-bubble
stageprofile-bubble:: stage1-bubble
- @case `echo all-stageprofile-*` in \
- 'all-stageprofile-*') ;; \
- *) echo Remaking stage profile ; rm -f all-stageprofile-* ;; \
- esac ; \
- $(MAKE) $(RECURSE_FLAGS_TO_PASS) all-stageprofile
+ @if test -f stageprofile-lean || test -f stage1-lean ; then \
+ echo Skipping rebuild of stageprofile ; \
+ else \
+ $(MAKE) $(RECURSE_FLAGS_TO_PASS) all-stageprofile; \
+ fi
.PHONY: all-stageprofile
all-stageprofile: \
@@ -31088,19 +30836,17 @@ all-stageprofile: \
maybe-all-stageprofile-zlib
+.PHONY: configure-stageprofile-bfd maybe-configure-stageprofile-bfd
+.PHONY: all-stageprofile-bfd maybe-all-stageprofile-bfd
+
maybe-configure-stageprofile-bfd:
maybe-all-stageprofile-bfd:
@if bfd-bootstrap
maybe-configure-stageprofile-bfd: configure-stageprofile-bfd
-configure-stageprofile-bfd: maybe-all-stage1-bfd
- $(MAKE) stageprofile-start
- @if [ -f stageprofile-bfd/Makefile ] ; then \
- $(STAMP) configure-stageprofile-bfd ; \
- exit 0; \
- else \
- true ; \
- fi ; \
+configure-stageprofile-bfd:
+ @$(MAKE) stageprofile-start
+ @[ -f bfd/Makefile ] && exit 0 || : ; \
r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(STAGE_HOST_EXPORTS) \
@@ -31119,35 +30865,31 @@ configure-stageprofile-bfd: maybe-all-stage1-bfd
esac; \
$(SHELL) $${libsrcdir}/configure \
$(HOST_CONFIGARGS) $${srcdiroption} \
- @stage2_werror_flag@ && \
- $(STAMP) ../configure-stageprofile-bfd
+ @stage2_werror_flag@
maybe-all-stageprofile-bfd: all-stageprofile-bfd
all-stageprofile-bfd: configure-stageprofile-bfd
- $(MAKE) stageprofile-start
+ @$(MAKE) stageprofile-start
@r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(STAGE_HOST_EXPORTS) \
cd bfd && \
$(MAKE) $(FLAGS_TO_PASS) \
$(POSTSTAGE1_FLAGS_TO_PASS) \
- CFLAGS="$(BOOT_CFLAGS) -fprofile-generate" && \
- $(STAMP) ../all-stageprofile-bfd
+ CFLAGS="$(BOOT_CFLAGS) -fprofile-generate"
@endif bfd-bootstrap
+.PHONY: configure-stageprofile-opcodes maybe-configure-stageprofile-opcodes
+.PHONY: all-stageprofile-opcodes maybe-all-stageprofile-opcodes
+
maybe-configure-stageprofile-opcodes:
maybe-all-stageprofile-opcodes:
@if opcodes-bootstrap
maybe-configure-stageprofile-opcodes: configure-stageprofile-opcodes
-configure-stageprofile-opcodes: maybe-all-stage1-opcodes
- $(MAKE) stageprofile-start
- @if [ -f stageprofile-opcodes/Makefile ] ; then \
- $(STAMP) configure-stageprofile-opcodes ; \
- exit 0; \
- else \
- true ; \
- fi ; \
+configure-stageprofile-opcodes:
+ @$(MAKE) stageprofile-start
+ @[ -f opcodes/Makefile ] && exit 0 || : ; \
r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(STAGE_HOST_EXPORTS) \
@@ -31166,35 +30908,31 @@ configure-stageprofile-opcodes: maybe-all-stage1-opcodes
esac; \
$(SHELL) $${libsrcdir}/configure \
$(HOST_CONFIGARGS) $${srcdiroption} \
- @stage2_werror_flag@ && \
- $(STAMP) ../configure-stageprofile-opcodes
+ @stage2_werror_flag@
maybe-all-stageprofile-opcodes: all-stageprofile-opcodes
all-stageprofile-opcodes: configure-stageprofile-opcodes
- $(MAKE) stageprofile-start
+ @$(MAKE) stageprofile-start
@r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(STAGE_HOST_EXPORTS) \
cd opcodes && \
$(MAKE) $(FLAGS_TO_PASS) \
$(POSTSTAGE1_FLAGS_TO_PASS) \
- CFLAGS="$(BOOT_CFLAGS) -fprofile-generate" && \
- $(STAMP) ../all-stageprofile-opcodes
+ CFLAGS="$(BOOT_CFLAGS) -fprofile-generate"
@endif opcodes-bootstrap
+.PHONY: configure-stageprofile-binutils maybe-configure-stageprofile-binutils
+.PHONY: all-stageprofile-binutils maybe-all-stageprofile-binutils
+
maybe-configure-stageprofile-binutils:
maybe-all-stageprofile-binutils:
@if binutils-bootstrap
maybe-configure-stageprofile-binutils: configure-stageprofile-binutils
-configure-stageprofile-binutils: maybe-all-stage1-binutils
- $(MAKE) stageprofile-start
- @if [ -f stageprofile-binutils/Makefile ] ; then \
- $(STAMP) configure-stageprofile-binutils ; \
- exit 0; \
- else \
- true ; \
- fi ; \
+configure-stageprofile-binutils:
+ @$(MAKE) stageprofile-start
+ @[ -f binutils/Makefile ] && exit 0 || : ; \
r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(STAGE_HOST_EXPORTS) \
@@ -31213,35 +30951,31 @@ configure-stageprofile-binutils: maybe-all-stage1-binutils
esac; \
$(SHELL) $${libsrcdir}/configure \
$(HOST_CONFIGARGS) $${srcdiroption} \
- @stage2_werror_flag@ && \
- $(STAMP) ../configure-stageprofile-binutils
+ @stage2_werror_flag@
maybe-all-stageprofile-binutils: all-stageprofile-binutils
all-stageprofile-binutils: configure-stageprofile-binutils
- $(MAKE) stageprofile-start
+ @$(MAKE) stageprofile-start
@r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(STAGE_HOST_EXPORTS) \
cd binutils && \
$(MAKE) $(FLAGS_TO_PASS) \
$(POSTSTAGE1_FLAGS_TO_PASS) \
- CFLAGS="$(BOOT_CFLAGS) -fprofile-generate" && \
- $(STAMP) ../all-stageprofile-binutils
+ CFLAGS="$(BOOT_CFLAGS) -fprofile-generate"
@endif binutils-bootstrap
+.PHONY: configure-stageprofile-gas maybe-configure-stageprofile-gas
+.PHONY: all-stageprofile-gas maybe-all-stageprofile-gas
+
maybe-configure-stageprofile-gas:
maybe-all-stageprofile-gas:
@if gas-bootstrap
maybe-configure-stageprofile-gas: configure-stageprofile-gas
-configure-stageprofile-gas: maybe-all-stage1-gas
- $(MAKE) stageprofile-start
- @if [ -f stageprofile-gas/Makefile ] ; then \
- $(STAMP) configure-stageprofile-gas ; \
- exit 0; \
- else \
- true ; \
- fi ; \
+configure-stageprofile-gas:
+ @$(MAKE) stageprofile-start
+ @[ -f gas/Makefile ] && exit 0 || : ; \
r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(STAGE_HOST_EXPORTS) \
@@ -31260,35 +30994,31 @@ configure-stageprofile-gas: maybe-all-stage1-gas
esac; \
$(SHELL) $${libsrcdir}/configure \
$(HOST_CONFIGARGS) $${srcdiroption} \
- @stage2_werror_flag@ && \
- $(STAMP) ../configure-stageprofile-gas
+ @stage2_werror_flag@
maybe-all-stageprofile-gas: all-stageprofile-gas
all-stageprofile-gas: configure-stageprofile-gas
- $(MAKE) stageprofile-start
+ @$(MAKE) stageprofile-start
@r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(STAGE_HOST_EXPORTS) \
cd gas && \
$(MAKE) $(FLAGS_TO_PASS) \
$(POSTSTAGE1_FLAGS_TO_PASS) \
- CFLAGS="$(BOOT_CFLAGS) -fprofile-generate" && \
- $(STAMP) ../all-stageprofile-gas
+ CFLAGS="$(BOOT_CFLAGS) -fprofile-generate"
@endif gas-bootstrap
+.PHONY: configure-stageprofile-gcc maybe-configure-stageprofile-gcc
+.PHONY: all-stageprofile-gcc maybe-all-stageprofile-gcc
+
maybe-configure-stageprofile-gcc:
maybe-all-stageprofile-gcc:
@if gcc-bootstrap
maybe-configure-stageprofile-gcc: configure-stageprofile-gcc
-configure-stageprofile-gcc: maybe-all-stage1-gcc
- $(MAKE) stageprofile-start
- @if [ -f stageprofile-gcc/Makefile ] ; then \
- $(STAMP) configure-stageprofile-gcc ; \
- exit 0; \
- else \
- true ; \
- fi ; \
+configure-stageprofile-gcc:
+ @$(MAKE) stageprofile-start
+ @[ -f gcc/Makefile ] && exit 0 || : ; \
r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(STAGE_HOST_EXPORTS) \
@@ -31307,35 +31037,31 @@ configure-stageprofile-gcc: maybe-all-stage1-gcc
esac; \
$(SHELL) $${libsrcdir}/configure \
$(HOST_CONFIGARGS) $${srcdiroption} \
- @stage2_werror_flag@ && \
- $(STAMP) ../configure-stageprofile-gcc
+ @stage2_werror_flag@
maybe-all-stageprofile-gcc: all-stageprofile-gcc
all-stageprofile-gcc: configure-stageprofile-gcc
- $(MAKE) stageprofile-start
+ @$(MAKE) stageprofile-start
@r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(STAGE_HOST_EXPORTS) \
cd gcc && \
$(MAKE) $(FLAGS_TO_PASS) \
$(POSTSTAGE1_FLAGS_TO_PASS) \
- CFLAGS="$(BOOT_CFLAGS) -fprofile-generate" $(EXTRA_GCC_FLAGS) && \
- $(STAMP) ../all-stageprofile-gcc
+ CFLAGS="$(BOOT_CFLAGS) -fprofile-generate" $(EXTRA_GCC_FLAGS)
@endif gcc-bootstrap
+.PHONY: configure-stageprofile-intl maybe-configure-stageprofile-intl
+.PHONY: all-stageprofile-intl maybe-all-stageprofile-intl
+
maybe-configure-stageprofile-intl:
maybe-all-stageprofile-intl:
@if intl-bootstrap
maybe-configure-stageprofile-intl: configure-stageprofile-intl
-configure-stageprofile-intl: maybe-all-stage1-intl
- $(MAKE) stageprofile-start
- @if [ -f stageprofile-intl/Makefile ] ; then \
- $(STAMP) configure-stageprofile-intl ; \
- exit 0; \
- else \
- true ; \
- fi ; \
+configure-stageprofile-intl:
+ @$(MAKE) stageprofile-start
+ @[ -f intl/Makefile ] && exit 0 || : ; \
r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(STAGE_HOST_EXPORTS) \
@@ -31354,35 +31080,31 @@ configure-stageprofile-intl: maybe-all-stage1-intl
esac; \
$(SHELL) $${libsrcdir}/configure \
$(HOST_CONFIGARGS) $${srcdiroption} \
- @stage2_werror_flag@ && \
- $(STAMP) ../configure-stageprofile-intl
+ @stage2_werror_flag@
maybe-all-stageprofile-intl: all-stageprofile-intl
all-stageprofile-intl: configure-stageprofile-intl
- $(MAKE) stageprofile-start
+ @$(MAKE) stageprofile-start
@r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(STAGE_HOST_EXPORTS) \
cd intl && \
$(MAKE) $(FLAGS_TO_PASS) \
$(POSTSTAGE1_FLAGS_TO_PASS) \
- CFLAGS="$(BOOT_CFLAGS) -fprofile-generate" && \
- $(STAMP) ../all-stageprofile-intl
+ CFLAGS="$(BOOT_CFLAGS) -fprofile-generate"
@endif intl-bootstrap
+.PHONY: configure-stageprofile-ld maybe-configure-stageprofile-ld
+.PHONY: all-stageprofile-ld maybe-all-stageprofile-ld
+
maybe-configure-stageprofile-ld:
maybe-all-stageprofile-ld:
@if ld-bootstrap
maybe-configure-stageprofile-ld: configure-stageprofile-ld
-configure-stageprofile-ld: maybe-all-stage1-ld
- $(MAKE) stageprofile-start
- @if [ -f stageprofile-ld/Makefile ] ; then \
- $(STAMP) configure-stageprofile-ld ; \
- exit 0; \
- else \
- true ; \
- fi ; \
+configure-stageprofile-ld:
+ @$(MAKE) stageprofile-start
+ @[ -f ld/Makefile ] && exit 0 || : ; \
r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(STAGE_HOST_EXPORTS) \
@@ -31401,35 +31123,31 @@ configure-stageprofile-ld: maybe-all-stage1-ld
esac; \
$(SHELL) $${libsrcdir}/configure \
$(HOST_CONFIGARGS) $${srcdiroption} \
- @stage2_werror_flag@ && \
- $(STAMP) ../configure-stageprofile-ld
+ @stage2_werror_flag@
maybe-all-stageprofile-ld: all-stageprofile-ld
all-stageprofile-ld: configure-stageprofile-ld
- $(MAKE) stageprofile-start
+ @$(MAKE) stageprofile-start
@r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(STAGE_HOST_EXPORTS) \
cd ld && \
$(MAKE) $(FLAGS_TO_PASS) \
$(POSTSTAGE1_FLAGS_TO_PASS) \
- CFLAGS="$(BOOT_CFLAGS) -fprofile-generate" && \
- $(STAMP) ../all-stageprofile-ld
+ CFLAGS="$(BOOT_CFLAGS) -fprofile-generate"
@endif ld-bootstrap
+.PHONY: configure-stageprofile-libcpp maybe-configure-stageprofile-libcpp
+.PHONY: all-stageprofile-libcpp maybe-all-stageprofile-libcpp
+
maybe-configure-stageprofile-libcpp:
maybe-all-stageprofile-libcpp:
@if libcpp-bootstrap
maybe-configure-stageprofile-libcpp: configure-stageprofile-libcpp
-configure-stageprofile-libcpp: maybe-all-stage1-libcpp
- $(MAKE) stageprofile-start
- @if [ -f stageprofile-libcpp/Makefile ] ; then \
- $(STAMP) configure-stageprofile-libcpp ; \
- exit 0; \
- else \
- true ; \
- fi ; \
+configure-stageprofile-libcpp:
+ @$(MAKE) stageprofile-start
+ @[ -f libcpp/Makefile ] && exit 0 || : ; \
r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(STAGE_HOST_EXPORTS) \
@@ -31448,35 +31166,31 @@ configure-stageprofile-libcpp: maybe-all-stage1-libcpp
esac; \
$(SHELL) $${libsrcdir}/configure \
$(HOST_CONFIGARGS) $${srcdiroption} \
- @stage2_werror_flag@ && \
- $(STAMP) ../configure-stageprofile-libcpp
+ @stage2_werror_flag@
maybe-all-stageprofile-libcpp: all-stageprofile-libcpp
all-stageprofile-libcpp: configure-stageprofile-libcpp
- $(MAKE) stageprofile-start
+ @$(MAKE) stageprofile-start
@r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(STAGE_HOST_EXPORTS) \
cd libcpp && \
$(MAKE) $(FLAGS_TO_PASS) \
$(POSTSTAGE1_FLAGS_TO_PASS) \
- CFLAGS="$(BOOT_CFLAGS) -fprofile-generate" && \
- $(STAMP) ../all-stageprofile-libcpp
+ CFLAGS="$(BOOT_CFLAGS) -fprofile-generate"
@endif libcpp-bootstrap
+.PHONY: configure-stageprofile-libbanshee maybe-configure-stageprofile-libbanshee
+.PHONY: all-stageprofile-libbanshee maybe-all-stageprofile-libbanshee
+
maybe-configure-stageprofile-libbanshee:
maybe-all-stageprofile-libbanshee:
@if libbanshee-bootstrap
maybe-configure-stageprofile-libbanshee: configure-stageprofile-libbanshee
-configure-stageprofile-libbanshee: maybe-all-stage1-libbanshee
- $(MAKE) stageprofile-start
- @if [ -f stageprofile-libbanshee/Makefile ] ; then \
- $(STAMP) configure-stageprofile-libbanshee ; \
- exit 0; \
- else \
- true ; \
- fi ; \
+configure-stageprofile-libbanshee:
+ @$(MAKE) stageprofile-start
+ @[ -f libbanshee/Makefile ] && exit 0 || : ; \
r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(STAGE_HOST_EXPORTS) \
@@ -31495,35 +31209,31 @@ configure-stageprofile-libbanshee: maybe-all-stage1-libbanshee
esac; \
$(SHELL) $${libsrcdir}/configure \
$(HOST_CONFIGARGS) $${srcdiroption} \
- @stage2_werror_flag@ && \
- $(STAMP) ../configure-stageprofile-libbanshee
+ @stage2_werror_flag@
maybe-all-stageprofile-libbanshee: all-stageprofile-libbanshee
all-stageprofile-libbanshee: configure-stageprofile-libbanshee
- $(MAKE) stageprofile-start
+ @$(MAKE) stageprofile-start
@r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(STAGE_HOST_EXPORTS) \
cd libbanshee && \
$(MAKE) $(FLAGS_TO_PASS) \
$(POSTSTAGE1_FLAGS_TO_PASS) \
- CFLAGS="$(BOOT_CFLAGS) -fprofile-generate" && \
- $(STAMP) ../all-stageprofile-libbanshee
+ CFLAGS="$(BOOT_CFLAGS) -fprofile-generate"
@endif libbanshee-bootstrap
+.PHONY: configure-stageprofile-libiberty maybe-configure-stageprofile-libiberty
+.PHONY: all-stageprofile-libiberty maybe-all-stageprofile-libiberty
+
maybe-configure-stageprofile-libiberty:
maybe-all-stageprofile-libiberty:
@if libiberty-bootstrap
maybe-configure-stageprofile-libiberty: configure-stageprofile-libiberty
-configure-stageprofile-libiberty: maybe-all-stage1-libiberty
- $(MAKE) stageprofile-start
- @if [ -f stageprofile-libiberty/Makefile ] ; then \
- $(STAMP) configure-stageprofile-libiberty ; \
- exit 0; \
- else \
- true ; \
- fi ; \
+configure-stageprofile-libiberty:
+ @$(MAKE) stageprofile-start
+ @[ -f libiberty/Makefile ] && exit 0 || : ; \
r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(STAGE_HOST_EXPORTS) \
@@ -31542,35 +31252,31 @@ configure-stageprofile-libiberty: maybe-all-stage1-libiberty
esac; \
$(SHELL) $${libsrcdir}/configure \
$(HOST_CONFIGARGS) $${srcdiroption} \
- @stage2_werror_flag@ && \
- $(STAMP) ../configure-stageprofile-libiberty
+ @stage2_werror_flag@
maybe-all-stageprofile-libiberty: all-stageprofile-libiberty
all-stageprofile-libiberty: configure-stageprofile-libiberty
- $(MAKE) stageprofile-start
+ @$(MAKE) stageprofile-start
@r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(STAGE_HOST_EXPORTS) \
cd libiberty && \
$(MAKE) $(FLAGS_TO_PASS) \
$(POSTSTAGE1_FLAGS_TO_PASS) \
- CFLAGS="$(BOOT_CFLAGS) -fprofile-generate" && \
- $(STAMP) ../all-stageprofile-libiberty
+ CFLAGS="$(BOOT_CFLAGS) -fprofile-generate"
@endif libiberty-bootstrap
+.PHONY: configure-stageprofile-zlib maybe-configure-stageprofile-zlib
+.PHONY: all-stageprofile-zlib maybe-all-stageprofile-zlib
+
maybe-configure-stageprofile-zlib:
maybe-all-stageprofile-zlib:
@if zlib-bootstrap
maybe-configure-stageprofile-zlib: configure-stageprofile-zlib
-configure-stageprofile-zlib: maybe-all-stage1-zlib
- $(MAKE) stageprofile-start
- @if [ -f stageprofile-zlib/Makefile ] ; then \
- $(STAMP) configure-stageprofile-zlib ; \
- exit 0; \
- else \
- true ; \
- fi ; \
+configure-stageprofile-zlib:
+ @$(MAKE) stageprofile-start
+ @[ -f zlib/Makefile ] && exit 0 || : ; \
r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(STAGE_HOST_EXPORTS) \
@@ -31589,20 +31295,18 @@ configure-stageprofile-zlib: maybe-all-stage1-zlib
esac; \
$(SHELL) $${libsrcdir}/configure \
$(HOST_CONFIGARGS) $${srcdiroption} \
- @stage2_werror_flag@ && \
- $(STAMP) ../configure-stageprofile-zlib
+ @stage2_werror_flag@
maybe-all-stageprofile-zlib: all-stageprofile-zlib
all-stageprofile-zlib: configure-stageprofile-zlib
- $(MAKE) stageprofile-start
+ @$(MAKE) stageprofile-start
@r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(STAGE_HOST_EXPORTS) \
cd zlib && \
$(MAKE) $(FLAGS_TO_PASS) \
$(POSTSTAGE1_FLAGS_TO_PASS) \
- CFLAGS="$(BOOT_CFLAGS) -fprofile-generate" && \
- $(STAMP) ../all-stageprofile-zlib
+ CFLAGS="$(BOOT_CFLAGS) -fprofile-generate"
@endif zlib-bootstrap
@@ -31613,35 +31317,13 @@ all-stageprofile-zlib: configure-stageprofile-zlib
-.PHONY: restageprofile touch-stageprofile distclean-stageprofile
+.PHONY: distclean-stageprofile
# Rules to wipe a stage and all the following ones, used for cleanstrap
distclean-stage1:: distclean-stageprofile
distclean-stageprofile::
[ -f stage_current ] && $(MAKE) `cat stage_current`-end || :
- rm -rf configure-stageprofile-* all-stageprofile-* stageprofile-*
-
-# Rules to renew the timestamp on a stage and all the following ones
-touch-stage1:: touch-stageprofile
-touch-stageprofile::
- @case `echo configure-stageprofile-*` in \
- 'configure-stageprofile-*') ;; \
- *) \
- echo '$(STAMP)' configure-stageprofile-* && \
- $(STAMP) configure-stageprofile-* ;; \
- esac ; \
- case `echo all-stageprofile-*` in \
- 'all-stageprofile-*') ;; \
- *) \
- echo '$(STAMP)' all-stageprofile-* && \
- $(STAMP) all-stageprofile-* ;; \
- esac
-
-# After building a stage, touch the following ones
-restage1:: touch-stageprofile
-restageprofile::
- rm -rf all-stageprofile-*
- $(MAKE) $(RECURSE_FLAGS_TO_PASS) all-stageprofile
+ rm -rf stageprofile-*
@endif gcc-bootstrap
@@ -31650,109 +31332,109 @@ restageprofile::
.PHONY: stagefeedback-start stagefeedback-end
stagefeedback-start::
- [ -f stage_current ] && $(MAKE) `cat stage_current`-end || :
+ @[ -f stage_current ] && $(MAKE) `cat stage_current`-end || : ; \
echo stagefeedback > stage_current ; \
echo stagefeedback > stage_last
@if bfd
- [ -d stagefeedback-bfd ] || mkdir stagefeedback-bfd; \
+ @[ -d stagefeedback-bfd ] || mkdir stagefeedback-bfd; \
set stagefeedback-bfd bfd ; @CREATE_LINK_TO_DIR@ ; \
set stage1-bfd prev-bfd ; @CREATE_LINK_TO_DIR@
@endif bfd
@if opcodes
- [ -d stagefeedback-opcodes ] || mkdir stagefeedback-opcodes; \
+ @[ -d stagefeedback-opcodes ] || mkdir stagefeedback-opcodes; \
set stagefeedback-opcodes opcodes ; @CREATE_LINK_TO_DIR@ ; \
set stage1-opcodes prev-opcodes ; @CREATE_LINK_TO_DIR@
@endif opcodes
@if binutils
- [ -d stagefeedback-binutils ] || mkdir stagefeedback-binutils; \
+ @[ -d stagefeedback-binutils ] || mkdir stagefeedback-binutils; \
set stagefeedback-binutils binutils ; @CREATE_LINK_TO_DIR@ ; \
set stage1-binutils prev-binutils ; @CREATE_LINK_TO_DIR@
@endif binutils
@if gas
- [ -d stagefeedback-gas ] || mkdir stagefeedback-gas; \
+ @[ -d stagefeedback-gas ] || mkdir stagefeedback-gas; \
set stagefeedback-gas gas ; @CREATE_LINK_TO_DIR@ ; \
set stage1-gas prev-gas ; @CREATE_LINK_TO_DIR@
@endif gas
@if gcc
- [ -d stagefeedback-gcc ] || mkdir stagefeedback-gcc; \
+ @[ -d stagefeedback-gcc ] || mkdir stagefeedback-gcc; \
set stagefeedback-gcc gcc ; @CREATE_LINK_TO_DIR@ ; \
set stage1-gcc prev-gcc ; @CREATE_LINK_TO_DIR@
@endif gcc
@if intl
- [ -d stagefeedback-intl ] || mkdir stagefeedback-intl; \
+ @[ -d stagefeedback-intl ] || mkdir stagefeedback-intl; \
set stagefeedback-intl intl ; @CREATE_LINK_TO_DIR@ ; \
set stage1-intl prev-intl ; @CREATE_LINK_TO_DIR@
@endif intl
@if ld
- [ -d stagefeedback-ld ] || mkdir stagefeedback-ld; \
+ @[ -d stagefeedback-ld ] || mkdir stagefeedback-ld; \
set stagefeedback-ld ld ; @CREATE_LINK_TO_DIR@ ; \
set stage1-ld prev-ld ; @CREATE_LINK_TO_DIR@
@endif ld
@if libcpp
- [ -d stagefeedback-libcpp ] || mkdir stagefeedback-libcpp; \
+ @[ -d stagefeedback-libcpp ] || mkdir stagefeedback-libcpp; \
set stagefeedback-libcpp libcpp ; @CREATE_LINK_TO_DIR@ ; \
set stage1-libcpp prev-libcpp ; @CREATE_LINK_TO_DIR@
@endif libcpp
@if libbanshee
- [ -d stagefeedback-libbanshee ] || mkdir stagefeedback-libbanshee; \
+ @[ -d stagefeedback-libbanshee ] || mkdir stagefeedback-libbanshee; \
set stagefeedback-libbanshee libbanshee ; @CREATE_LINK_TO_DIR@ ; \
set stage1-libbanshee prev-libbanshee ; @CREATE_LINK_TO_DIR@
@endif libbanshee
@if libiberty
- [ -d stagefeedback-libiberty ] || mkdir stagefeedback-libiberty; \
+ @[ -d stagefeedback-libiberty ] || mkdir stagefeedback-libiberty; \
set stagefeedback-libiberty libiberty ; @CREATE_LINK_TO_DIR@ ; \
set stage1-libiberty prev-libiberty ; @CREATE_LINK_TO_DIR@
@endif libiberty
@if zlib
- [ -d stagefeedback-zlib ] || mkdir stagefeedback-zlib; \
+ @[ -d stagefeedback-zlib ] || mkdir stagefeedback-zlib; \
set stagefeedback-zlib zlib ; @CREATE_LINK_TO_DIR@ ; \
set stage1-zlib prev-zlib ; @CREATE_LINK_TO_DIR@
@endif zlib
stagefeedback-end::
- rm -f stage_current
+ @rm -f stage_current
@if bfd
- set bfd stagefeedback-bfd ; @UNDO_LINK_TO_DIR@ ; \
+ @set bfd stagefeedback-bfd ; @UNDO_LINK_TO_DIR@ ; \
set prev-bfd stage1-bfd ; @UNDO_LINK_TO_DIR@
@endif bfd
@if opcodes
- set opcodes stagefeedback-opcodes ; @UNDO_LINK_TO_DIR@ ; \
+ @set opcodes stagefeedback-opcodes ; @UNDO_LINK_TO_DIR@ ; \
set prev-opcodes stage1-opcodes ; @UNDO_LINK_TO_DIR@
@endif opcodes
@if binutils
- set binutils stagefeedback-binutils ; @UNDO_LINK_TO_DIR@ ; \
+ @set binutils stagefeedback-binutils ; @UNDO_LINK_TO_DIR@ ; \
set prev-binutils stage1-binutils ; @UNDO_LINK_TO_DIR@
@endif binutils
@if gas
- set gas stagefeedback-gas ; @UNDO_LINK_TO_DIR@ ; \
+ @set gas stagefeedback-gas ; @UNDO_LINK_TO_DIR@ ; \
set prev-gas stage1-gas ; @UNDO_LINK_TO_DIR@
@endif gas
@if gcc
- set gcc stagefeedback-gcc ; @UNDO_LINK_TO_DIR@ ; \
+ @set gcc stagefeedback-gcc ; @UNDO_LINK_TO_DIR@ ; \
set prev-gcc stage1-gcc ; @UNDO_LINK_TO_DIR@
@endif gcc
@if intl
- set intl stagefeedback-intl ; @UNDO_LINK_TO_DIR@ ; \
+ @set intl stagefeedback-intl ; @UNDO_LINK_TO_DIR@ ; \
set prev-intl stage1-intl ; @UNDO_LINK_TO_DIR@
@endif intl
@if ld
- set ld stagefeedback-ld ; @UNDO_LINK_TO_DIR@ ; \
+ @set ld stagefeedback-ld ; @UNDO_LINK_TO_DIR@ ; \
set prev-ld stage1-ld ; @UNDO_LINK_TO_DIR@
@endif ld
@if libcpp
- set libcpp stagefeedback-libcpp ; @UNDO_LINK_TO_DIR@ ; \
+ @set libcpp stagefeedback-libcpp ; @UNDO_LINK_TO_DIR@ ; \
set prev-libcpp stage1-libcpp ; @UNDO_LINK_TO_DIR@
@endif libcpp
@if libbanshee
- set libbanshee stagefeedback-libbanshee ; @UNDO_LINK_TO_DIR@ ; \
+ @set libbanshee stagefeedback-libbanshee ; @UNDO_LINK_TO_DIR@ ; \
set prev-libbanshee stage1-libbanshee ; @UNDO_LINK_TO_DIR@
@endif libbanshee
@if libiberty
- set libiberty stagefeedback-libiberty ; @UNDO_LINK_TO_DIR@ ; \
+ @set libiberty stagefeedback-libiberty ; @UNDO_LINK_TO_DIR@ ; \
set prev-libiberty stage1-libiberty ; @UNDO_LINK_TO_DIR@
@endif libiberty
@if zlib
- set zlib stagefeedback-zlib ; @UNDO_LINK_TO_DIR@ ; \
+ @set zlib stagefeedback-zlib ; @UNDO_LINK_TO_DIR@ ; \
set prev-zlib stage1-zlib ; @UNDO_LINK_TO_DIR@
@endif zlib
@@ -31761,11 +31443,11 @@ stagefeedback-end::
# be reconfigured as well.
.PHONY: stagefeedback-bubble
stagefeedback-bubble:: stage1-bubble
- @case `echo all-stagefeedback-*` in \
- 'all-stagefeedback-*') ;; \
- *) echo Remaking stage feedback ; rm -f all-stagefeedback-* ;; \
- esac ; \
- $(MAKE) $(RECURSE_FLAGS_TO_PASS) all-stagefeedback
+ @if test -f stagefeedback-lean || test -f stage1-lean ; then \
+ echo Skipping rebuild of stagefeedback ; \
+ else \
+ $(MAKE) $(RECURSE_FLAGS_TO_PASS) all-stagefeedback; \
+ fi
.PHONY: all-stagefeedback
all-stagefeedback: \
@@ -31782,19 +31464,17 @@ all-stagefeedback: \
maybe-all-stagefeedback-zlib
+.PHONY: configure-stagefeedback-bfd maybe-configure-stagefeedback-bfd
+.PHONY: all-stagefeedback-bfd maybe-all-stagefeedback-bfd
+
maybe-configure-stagefeedback-bfd:
maybe-all-stagefeedback-bfd:
@if bfd-bootstrap
maybe-configure-stagefeedback-bfd: configure-stagefeedback-bfd
-configure-stagefeedback-bfd: maybe-all-stage1-bfd
- $(MAKE) stagefeedback-start
- @if [ -f stagefeedback-bfd/Makefile ] ; then \
- $(STAMP) configure-stagefeedback-bfd ; \
- exit 0; \
- else \
- true ; \
- fi ; \
+configure-stagefeedback-bfd:
+ @$(MAKE) stagefeedback-start
+ @[ -f bfd/Makefile ] && exit 0 || : ; \
r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(STAGE_HOST_EXPORTS) \
@@ -31813,35 +31493,31 @@ configure-stagefeedback-bfd: maybe-all-stage1-bfd
esac; \
$(SHELL) $${libsrcdir}/configure \
$(HOST_CONFIGARGS) $${srcdiroption} \
- @stage2_werror_flag@ && \
- $(STAMP) ../configure-stagefeedback-bfd
+ @stage2_werror_flag@
maybe-all-stagefeedback-bfd: all-stagefeedback-bfd
all-stagefeedback-bfd: configure-stagefeedback-bfd
- $(MAKE) stagefeedback-start
+ @$(MAKE) stagefeedback-start
@r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(STAGE_HOST_EXPORTS) \
cd bfd && \
$(MAKE) $(FLAGS_TO_PASS) \
$(POSTSTAGE1_FLAGS_TO_PASS) \
- CFLAGS="$(BOOT_CFLAGS) -fprofile-use" && \
- $(STAMP) ../all-stagefeedback-bfd
+ CFLAGS="$(BOOT_CFLAGS) -fprofile-use"
@endif bfd-bootstrap
+.PHONY: configure-stagefeedback-opcodes maybe-configure-stagefeedback-opcodes
+.PHONY: all-stagefeedback-opcodes maybe-all-stagefeedback-opcodes
+
maybe-configure-stagefeedback-opcodes:
maybe-all-stagefeedback-opcodes:
@if opcodes-bootstrap
maybe-configure-stagefeedback-opcodes: configure-stagefeedback-opcodes
-configure-stagefeedback-opcodes: maybe-all-stage1-opcodes
- $(MAKE) stagefeedback-start
- @if [ -f stagefeedback-opcodes/Makefile ] ; then \
- $(STAMP) configure-stagefeedback-opcodes ; \
- exit 0; \
- else \
- true ; \
- fi ; \
+configure-stagefeedback-opcodes:
+ @$(MAKE) stagefeedback-start
+ @[ -f opcodes/Makefile ] && exit 0 || : ; \
r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(STAGE_HOST_EXPORTS) \
@@ -31860,35 +31536,31 @@ configure-stagefeedback-opcodes: maybe-all-stage1-opcodes
esac; \
$(SHELL) $${libsrcdir}/configure \
$(HOST_CONFIGARGS) $${srcdiroption} \
- @stage2_werror_flag@ && \
- $(STAMP) ../configure-stagefeedback-opcodes
+ @stage2_werror_flag@
maybe-all-stagefeedback-opcodes: all-stagefeedback-opcodes
all-stagefeedback-opcodes: configure-stagefeedback-opcodes
- $(MAKE) stagefeedback-start
+ @$(MAKE) stagefeedback-start
@r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(STAGE_HOST_EXPORTS) \
cd opcodes && \
$(MAKE) $(FLAGS_TO_PASS) \
$(POSTSTAGE1_FLAGS_TO_PASS) \
- CFLAGS="$(BOOT_CFLAGS) -fprofile-use" && \
- $(STAMP) ../all-stagefeedback-opcodes
+ CFLAGS="$(BOOT_CFLAGS) -fprofile-use"
@endif opcodes-bootstrap
+.PHONY: configure-stagefeedback-binutils maybe-configure-stagefeedback-binutils
+.PHONY: all-stagefeedback-binutils maybe-all-stagefeedback-binutils
+
maybe-configure-stagefeedback-binutils:
maybe-all-stagefeedback-binutils:
@if binutils-bootstrap
maybe-configure-stagefeedback-binutils: configure-stagefeedback-binutils
-configure-stagefeedback-binutils: maybe-all-stage1-binutils
- $(MAKE) stagefeedback-start
- @if [ -f stagefeedback-binutils/Makefile ] ; then \
- $(STAMP) configure-stagefeedback-binutils ; \
- exit 0; \
- else \
- true ; \
- fi ; \
+configure-stagefeedback-binutils:
+ @$(MAKE) stagefeedback-start
+ @[ -f binutils/Makefile ] && exit 0 || : ; \
r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(STAGE_HOST_EXPORTS) \
@@ -31907,35 +31579,31 @@ configure-stagefeedback-binutils: maybe-all-stage1-binutils
esac; \
$(SHELL) $${libsrcdir}/configure \
$(HOST_CONFIGARGS) $${srcdiroption} \
- @stage2_werror_flag@ && \
- $(STAMP) ../configure-stagefeedback-binutils
+ @stage2_werror_flag@
maybe-all-stagefeedback-binutils: all-stagefeedback-binutils
all-stagefeedback-binutils: configure-stagefeedback-binutils
- $(MAKE) stagefeedback-start
+ @$(MAKE) stagefeedback-start
@r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(STAGE_HOST_EXPORTS) \
cd binutils && \
$(MAKE) $(FLAGS_TO_PASS) \
$(POSTSTAGE1_FLAGS_TO_PASS) \
- CFLAGS="$(BOOT_CFLAGS) -fprofile-use" && \
- $(STAMP) ../all-stagefeedback-binutils
+ CFLAGS="$(BOOT_CFLAGS) -fprofile-use"
@endif binutils-bootstrap
+.PHONY: configure-stagefeedback-gas maybe-configure-stagefeedback-gas
+.PHONY: all-stagefeedback-gas maybe-all-stagefeedback-gas
+
maybe-configure-stagefeedback-gas:
maybe-all-stagefeedback-gas:
@if gas-bootstrap
maybe-configure-stagefeedback-gas: configure-stagefeedback-gas
-configure-stagefeedback-gas: maybe-all-stage1-gas
- $(MAKE) stagefeedback-start
- @if [ -f stagefeedback-gas/Makefile ] ; then \
- $(STAMP) configure-stagefeedback-gas ; \
- exit 0; \
- else \
- true ; \
- fi ; \
+configure-stagefeedback-gas:
+ @$(MAKE) stagefeedback-start
+ @[ -f gas/Makefile ] && exit 0 || : ; \
r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(STAGE_HOST_EXPORTS) \
@@ -31954,35 +31622,31 @@ configure-stagefeedback-gas: maybe-all-stage1-gas
esac; \
$(SHELL) $${libsrcdir}/configure \
$(HOST_CONFIGARGS) $${srcdiroption} \
- @stage2_werror_flag@ && \
- $(STAMP) ../configure-stagefeedback-gas
+ @stage2_werror_flag@
maybe-all-stagefeedback-gas: all-stagefeedback-gas
all-stagefeedback-gas: configure-stagefeedback-gas
- $(MAKE) stagefeedback-start
+ @$(MAKE) stagefeedback-start
@r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(STAGE_HOST_EXPORTS) \
cd gas && \
$(MAKE) $(FLAGS_TO_PASS) \
$(POSTSTAGE1_FLAGS_TO_PASS) \
- CFLAGS="$(BOOT_CFLAGS) -fprofile-use" && \
- $(STAMP) ../all-stagefeedback-gas
+ CFLAGS="$(BOOT_CFLAGS) -fprofile-use"
@endif gas-bootstrap
+.PHONY: configure-stagefeedback-gcc maybe-configure-stagefeedback-gcc
+.PHONY: all-stagefeedback-gcc maybe-all-stagefeedback-gcc
+
maybe-configure-stagefeedback-gcc:
maybe-all-stagefeedback-gcc:
@if gcc-bootstrap
maybe-configure-stagefeedback-gcc: configure-stagefeedback-gcc
-configure-stagefeedback-gcc: maybe-all-stage1-gcc
- $(MAKE) stagefeedback-start
- @if [ -f stagefeedback-gcc/Makefile ] ; then \
- $(STAMP) configure-stagefeedback-gcc ; \
- exit 0; \
- else \
- true ; \
- fi ; \
+configure-stagefeedback-gcc:
+ @$(MAKE) stagefeedback-start
+ @[ -f gcc/Makefile ] && exit 0 || : ; \
r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(STAGE_HOST_EXPORTS) \
@@ -32001,35 +31665,31 @@ configure-stagefeedback-gcc: maybe-all-stage1-gcc
esac; \
$(SHELL) $${libsrcdir}/configure \
$(HOST_CONFIGARGS) $${srcdiroption} \
- @stage2_werror_flag@ && \
- $(STAMP) ../configure-stagefeedback-gcc
+ @stage2_werror_flag@
maybe-all-stagefeedback-gcc: all-stagefeedback-gcc
all-stagefeedback-gcc: configure-stagefeedback-gcc
- $(MAKE) stagefeedback-start
+ @$(MAKE) stagefeedback-start
@r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(STAGE_HOST_EXPORTS) \
cd gcc && \
$(MAKE) $(FLAGS_TO_PASS) \
$(POSTSTAGE1_FLAGS_TO_PASS) \
- CFLAGS="$(BOOT_CFLAGS) -fprofile-use" $(EXTRA_GCC_FLAGS) && \
- $(STAMP) ../all-stagefeedback-gcc
+ CFLAGS="$(BOOT_CFLAGS) -fprofile-use" $(EXTRA_GCC_FLAGS)
@endif gcc-bootstrap
+.PHONY: configure-stagefeedback-intl maybe-configure-stagefeedback-intl
+.PHONY: all-stagefeedback-intl maybe-all-stagefeedback-intl
+
maybe-configure-stagefeedback-intl:
maybe-all-stagefeedback-intl:
@if intl-bootstrap
maybe-configure-stagefeedback-intl: configure-stagefeedback-intl
-configure-stagefeedback-intl: maybe-all-stage1-intl
- $(MAKE) stagefeedback-start
- @if [ -f stagefeedback-intl/Makefile ] ; then \
- $(STAMP) configure-stagefeedback-intl ; \
- exit 0; \
- else \
- true ; \
- fi ; \
+configure-stagefeedback-intl:
+ @$(MAKE) stagefeedback-start
+ @[ -f intl/Makefile ] && exit 0 || : ; \
r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(STAGE_HOST_EXPORTS) \
@@ -32048,35 +31708,31 @@ configure-stagefeedback-intl: maybe-all-stage1-intl
esac; \
$(SHELL) $${libsrcdir}/configure \
$(HOST_CONFIGARGS) $${srcdiroption} \
- @stage2_werror_flag@ && \
- $(STAMP) ../configure-stagefeedback-intl
+ @stage2_werror_flag@
maybe-all-stagefeedback-intl: all-stagefeedback-intl
all-stagefeedback-intl: configure-stagefeedback-intl
- $(MAKE) stagefeedback-start
+ @$(MAKE) stagefeedback-start
@r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(STAGE_HOST_EXPORTS) \
cd intl && \
$(MAKE) $(FLAGS_TO_PASS) \
$(POSTSTAGE1_FLAGS_TO_PASS) \
- CFLAGS="$(BOOT_CFLAGS) -fprofile-use" && \
- $(STAMP) ../all-stagefeedback-intl
+ CFLAGS="$(BOOT_CFLAGS) -fprofile-use"
@endif intl-bootstrap
+.PHONY: configure-stagefeedback-ld maybe-configure-stagefeedback-ld
+.PHONY: all-stagefeedback-ld maybe-all-stagefeedback-ld
+
maybe-configure-stagefeedback-ld:
maybe-all-stagefeedback-ld:
@if ld-bootstrap
maybe-configure-stagefeedback-ld: configure-stagefeedback-ld
-configure-stagefeedback-ld: maybe-all-stage1-ld
- $(MAKE) stagefeedback-start
- @if [ -f stagefeedback-ld/Makefile ] ; then \
- $(STAMP) configure-stagefeedback-ld ; \
- exit 0; \
- else \
- true ; \
- fi ; \
+configure-stagefeedback-ld:
+ @$(MAKE) stagefeedback-start
+ @[ -f ld/Makefile ] && exit 0 || : ; \
r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(STAGE_HOST_EXPORTS) \
@@ -32095,35 +31751,31 @@ configure-stagefeedback-ld: maybe-all-stage1-ld
esac; \
$(SHELL) $${libsrcdir}/configure \
$(HOST_CONFIGARGS) $${srcdiroption} \
- @stage2_werror_flag@ && \
- $(STAMP) ../configure-stagefeedback-ld
+ @stage2_werror_flag@
maybe-all-stagefeedback-ld: all-stagefeedback-ld
all-stagefeedback-ld: configure-stagefeedback-ld
- $(MAKE) stagefeedback-start
+ @$(MAKE) stagefeedback-start
@r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(STAGE_HOST_EXPORTS) \
cd ld && \
$(MAKE) $(FLAGS_TO_PASS) \
$(POSTSTAGE1_FLAGS_TO_PASS) \
- CFLAGS="$(BOOT_CFLAGS) -fprofile-use" && \
- $(STAMP) ../all-stagefeedback-ld
+ CFLAGS="$(BOOT_CFLAGS) -fprofile-use"
@endif ld-bootstrap
+.PHONY: configure-stagefeedback-libcpp maybe-configure-stagefeedback-libcpp
+.PHONY: all-stagefeedback-libcpp maybe-all-stagefeedback-libcpp
+
maybe-configure-stagefeedback-libcpp:
maybe-all-stagefeedback-libcpp:
@if libcpp-bootstrap
maybe-configure-stagefeedback-libcpp: configure-stagefeedback-libcpp
-configure-stagefeedback-libcpp: maybe-all-stage1-libcpp
- $(MAKE) stagefeedback-start
- @if [ -f stagefeedback-libcpp/Makefile ] ; then \
- $(STAMP) configure-stagefeedback-libcpp ; \
- exit 0; \
- else \
- true ; \
- fi ; \
+configure-stagefeedback-libcpp:
+ @$(MAKE) stagefeedback-start
+ @[ -f libcpp/Makefile ] && exit 0 || : ; \
r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(STAGE_HOST_EXPORTS) \
@@ -32142,35 +31794,31 @@ configure-stagefeedback-libcpp: maybe-all-stage1-libcpp
esac; \
$(SHELL) $${libsrcdir}/configure \
$(HOST_CONFIGARGS) $${srcdiroption} \
- @stage2_werror_flag@ && \
- $(STAMP) ../configure-stagefeedback-libcpp
+ @stage2_werror_flag@
maybe-all-stagefeedback-libcpp: all-stagefeedback-libcpp
all-stagefeedback-libcpp: configure-stagefeedback-libcpp
- $(MAKE) stagefeedback-start
+ @$(MAKE) stagefeedback-start
@r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(STAGE_HOST_EXPORTS) \
cd libcpp && \
$(MAKE) $(FLAGS_TO_PASS) \
$(POSTSTAGE1_FLAGS_TO_PASS) \
- CFLAGS="$(BOOT_CFLAGS) -fprofile-use" && \
- $(STAMP) ../all-stagefeedback-libcpp
+ CFLAGS="$(BOOT_CFLAGS) -fprofile-use"
@endif libcpp-bootstrap
+.PHONY: configure-stagefeedback-libbanshee maybe-configure-stagefeedback-libbanshee
+.PHONY: all-stagefeedback-libbanshee maybe-all-stagefeedback-libbanshee
+
maybe-configure-stagefeedback-libbanshee:
maybe-all-stagefeedback-libbanshee:
@if libbanshee-bootstrap
maybe-configure-stagefeedback-libbanshee: configure-stagefeedback-libbanshee
-configure-stagefeedback-libbanshee: maybe-all-stage1-libbanshee
- $(MAKE) stagefeedback-start
- @if [ -f stagefeedback-libbanshee/Makefile ] ; then \
- $(STAMP) configure-stagefeedback-libbanshee ; \
- exit 0; \
- else \
- true ; \
- fi ; \
+configure-stagefeedback-libbanshee:
+ @$(MAKE) stagefeedback-start
+ @[ -f libbanshee/Makefile ] && exit 0 || : ; \
r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(STAGE_HOST_EXPORTS) \
@@ -32189,35 +31837,31 @@ configure-stagefeedback-libbanshee: maybe-all-stage1-libbanshee
esac; \
$(SHELL) $${libsrcdir}/configure \
$(HOST_CONFIGARGS) $${srcdiroption} \
- @stage2_werror_flag@ && \
- $(STAMP) ../configure-stagefeedback-libbanshee
+ @stage2_werror_flag@
maybe-all-stagefeedback-libbanshee: all-stagefeedback-libbanshee
all-stagefeedback-libbanshee: configure-stagefeedback-libbanshee
- $(MAKE) stagefeedback-start
+ @$(MAKE) stagefeedback-start
@r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(STAGE_HOST_EXPORTS) \
cd libbanshee && \
$(MAKE) $(FLAGS_TO_PASS) \
$(POSTSTAGE1_FLAGS_TO_PASS) \
- CFLAGS="$(BOOT_CFLAGS) -fprofile-use" && \
- $(STAMP) ../all-stagefeedback-libbanshee
+ CFLAGS="$(BOOT_CFLAGS) -fprofile-use"
@endif libbanshee-bootstrap
+.PHONY: configure-stagefeedback-libiberty maybe-configure-stagefeedback-libiberty
+.PHONY: all-stagefeedback-libiberty maybe-all-stagefeedback-libiberty
+
maybe-configure-stagefeedback-libiberty:
maybe-all-stagefeedback-libiberty:
@if libiberty-bootstrap
maybe-configure-stagefeedback-libiberty: configure-stagefeedback-libiberty
-configure-stagefeedback-libiberty: maybe-all-stage1-libiberty
- $(MAKE) stagefeedback-start
- @if [ -f stagefeedback-libiberty/Makefile ] ; then \
- $(STAMP) configure-stagefeedback-libiberty ; \
- exit 0; \
- else \
- true ; \
- fi ; \
+configure-stagefeedback-libiberty:
+ @$(MAKE) stagefeedback-start
+ @[ -f libiberty/Makefile ] && exit 0 || : ; \
r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(STAGE_HOST_EXPORTS) \
@@ -32236,35 +31880,31 @@ configure-stagefeedback-libiberty: maybe-all-stage1-libiberty
esac; \
$(SHELL) $${libsrcdir}/configure \
$(HOST_CONFIGARGS) $${srcdiroption} \
- @stage2_werror_flag@ && \
- $(STAMP) ../configure-stagefeedback-libiberty
+ @stage2_werror_flag@
maybe-all-stagefeedback-libiberty: all-stagefeedback-libiberty
all-stagefeedback-libiberty: configure-stagefeedback-libiberty
- $(MAKE) stagefeedback-start
+ @$(MAKE) stagefeedback-start
@r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(STAGE_HOST_EXPORTS) \
cd libiberty && \
$(MAKE) $(FLAGS_TO_PASS) \
$(POSTSTAGE1_FLAGS_TO_PASS) \
- CFLAGS="$(BOOT_CFLAGS) -fprofile-use" && \
- $(STAMP) ../all-stagefeedback-libiberty
+ CFLAGS="$(BOOT_CFLAGS) -fprofile-use"
@endif libiberty-bootstrap
+.PHONY: configure-stagefeedback-zlib maybe-configure-stagefeedback-zlib
+.PHONY: all-stagefeedback-zlib maybe-all-stagefeedback-zlib
+
maybe-configure-stagefeedback-zlib:
maybe-all-stagefeedback-zlib:
@if zlib-bootstrap
maybe-configure-stagefeedback-zlib: configure-stagefeedback-zlib
-configure-stagefeedback-zlib: maybe-all-stage1-zlib
- $(MAKE) stagefeedback-start
- @if [ -f stagefeedback-zlib/Makefile ] ; then \
- $(STAMP) configure-stagefeedback-zlib ; \
- exit 0; \
- else \
- true ; \
- fi ; \
+configure-stagefeedback-zlib:
+ @$(MAKE) stagefeedback-start
+ @[ -f zlib/Makefile ] && exit 0 || : ; \
r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(STAGE_HOST_EXPORTS) \
@@ -32283,20 +31923,18 @@ configure-stagefeedback-zlib: maybe-all-stage1-zlib
esac; \
$(SHELL) $${libsrcdir}/configure \
$(HOST_CONFIGARGS) $${srcdiroption} \
- @stage2_werror_flag@ && \
- $(STAMP) ../configure-stagefeedback-zlib
+ @stage2_werror_flag@
maybe-all-stagefeedback-zlib: all-stagefeedback-zlib
all-stagefeedback-zlib: configure-stagefeedback-zlib
- $(MAKE) stagefeedback-start
+ @$(MAKE) stagefeedback-start
@r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(STAGE_HOST_EXPORTS) \
cd zlib && \
$(MAKE) $(FLAGS_TO_PASS) \
$(POSTSTAGE1_FLAGS_TO_PASS) \
- CFLAGS="$(BOOT_CFLAGS) -fprofile-use" && \
- $(STAMP) ../all-stagefeedback-zlib
+ CFLAGS="$(BOOT_CFLAGS) -fprofile-use"
@endif zlib-bootstrap
@@ -32307,35 +31945,13 @@ all-stagefeedback-zlib: configure-stagefeedback-zlib
-.PHONY: restagefeedback touch-stagefeedback distclean-stagefeedback
+.PHONY: distclean-stagefeedback
# Rules to wipe a stage and all the following ones, used for cleanstrap
distclean-stage1:: distclean-stagefeedback
distclean-stagefeedback::
[ -f stage_current ] && $(MAKE) `cat stage_current`-end || :
- rm -rf configure-stagefeedback-* all-stagefeedback-* stagefeedback-*
-
-# Rules to renew the timestamp on a stage and all the following ones
-touch-stage1:: touch-stagefeedback
-touch-stagefeedback::
- @case `echo configure-stagefeedback-*` in \
- 'configure-stagefeedback-*') ;; \
- *) \
- echo '$(STAMP)' configure-stagefeedback-* && \
- $(STAMP) configure-stagefeedback-* ;; \
- esac ; \
- case `echo all-stagefeedback-*` in \
- 'all-stagefeedback-*') ;; \
- *) \
- echo '$(STAMP)' all-stagefeedback-* && \
- $(STAMP) all-stagefeedback-* ;; \
- esac
-
-# After building a stage, touch the following ones
-restage1:: touch-stagefeedback
-restagefeedback::
- rm -rf all-stagefeedback-*
- $(MAKE) $(RECURSE_FLAGS_TO_PASS) all-stagefeedback
+ rm -rf stagefeedback-*
@endif gcc-bootstrap
diff --git a/Makefile.tpl b/Makefile.tpl
index 27ab1fb..fed6824 100644
--- a/Makefile.tpl
+++ b/Makefile.tpl
@@ -1376,19 +1376,19 @@ POSTSTAGE1_FLAGS_TO_PASS = \
.PHONY: stage[+id+]-start stage[+id+]-end
stage[+id+]-start::
- [ -f stage_current ] && $(MAKE) `cat stage_current`-end || :
+ @[ -f stage_current ] && $(MAKE) `cat stage_current`-end || : ; \
echo stage[+id+] > stage_current ; \
echo stage[+id+] > stage_last[+ FOR host_modules +][+ IF bootstrap +]
@if [+ module +]
- [ -d stage[+id+]-[+module+] ] || mkdir stage[+id+]-[+module+]; \
+ @[ -d stage[+id+]-[+module+] ] || mkdir stage[+id+]-[+module+]; \
set stage[+id+]-[+module+] [+module+] ; @CREATE_LINK_TO_DIR@ [+ IF prev +] ; \
set stage[+prev+]-[+module+] prev-[+module+] ; @CREATE_LINK_TO_DIR@ [+ ENDIF prev +]
@endif [+ module +][+ ENDIF bootstrap +][+ ENDFOR host_modules +]
stage[+id+]-end::
- rm -f stage_current[+ FOR host_modules +][+ IF bootstrap +]
+ @rm -f stage_current[+ FOR host_modules +][+ IF bootstrap +]
@if [+ module +]
- set [+module+] stage[+id+]-[+module+] ; @UNDO_LINK_TO_DIR@ [+ IF prev +] ; \
+ @set [+module+] stage[+id+]-[+module+] ; @UNDO_LINK_TO_DIR@ [+ IF prev +] ; \
set prev-[+module+] stage[+prev+]-[+module+] ; @UNDO_LINK_TO_DIR@ [+ ENDIF prev +]
@endif [+ module +][+ ENDIF bootstrap +][+ ENDFOR host_modules +]
@@ -1396,12 +1396,14 @@ stage[+id+]-end::
# are remade, but not reconfigured. The next stage (if any) will not
# be reconfigured as well.
.PHONY: stage[+id+]-bubble
-stage[+id+]-bubble:: [+ IF prev +]stage[+prev+]-bubble[+ ENDIF +]
- @case `echo all-stage[+id+]-*` in \
- 'all-stage[+id+]-*') ;; \
- *) echo Remaking stage [+id+] ; rm -f all-stage[+id+]-* ;; \
- esac ; \
- $(MAKE) $(RECURSE_FLAGS_TO_PASS) all-stage[+id+]
+stage[+id+]-bubble:: [+ IF prev +]stage[+prev+]-bubble[+ ENDIF +][+IF lean +]
+ @bootstrap_lean@-rm -rf stage[+lean+]-* ; $(STAMP) stage[+lean+]-lean[+ ENDIF lean +]
+ @if test -f stage[+id+]-lean [+
+ IF prev +]|| test -f stage[+prev+]-lean [+ ENDIF prev +] ; then \
+ echo Skipping rebuild of stage[+id+] ; \
+ else \
+ $(MAKE) $(RECURSE_FLAGS_TO_PASS) all-stage[+id+]; \
+ fi
.PHONY: all-stage[+id+]
all-stage[+id+]: [+ FOR host_modules +][+ IF bootstrap +]\
@@ -1409,19 +1411,17 @@ all-stage[+id+]: [+ FOR host_modules +][+ IF bootstrap +]\
ENDIF bootstrap+] [+ ENDFOR host_modules +]
[+ FOR host_modules +][+ IF bootstrap +]
+.PHONY: configure-stage[+id+]-[+module+] maybe-configure-stage[+id+]-[+module+]
+.PHONY: all-stage[+id+]-[+module+] maybe-all-stage[+id+]-[+module+]
+
maybe-configure-stage[+id+]-[+module+]:
maybe-all-stage[+id+]-[+module+]:
@if [+module+]-bootstrap
maybe-configure-stage[+id+]-[+module+]: configure-stage[+id+]-[+module+]
-configure-stage[+id+]-[+module+]: [+ IF prev +] maybe-all-stage[+prev+]-[+module+] [+ ENDIF prev +]
- $(MAKE) stage[+id+]-start
- @if [ -f stage[+id+]-[+module+]/Makefile ] ; then \
- $(STAMP) configure-stage[+id+]-[+module+] ; \
- exit 0; \
- else \
- true ; \
- fi ; \
+configure-stage[+id+]-[+module+]:
+ @$(MAKE) stage[+id+]-start
+ @[ -f [+module+]/Makefile ] && exit 0 || : ; \
r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; [+ IF prev +] \
$(STAGE_HOST_EXPORTS) [+ ELSE prev +] \
@@ -1441,12 +1441,11 @@ configure-stage[+id+]-[+module+]: [+ IF prev +] maybe-all-stage[+prev+]-[+module
esac; \
$(SHELL) $${libsrcdir}/configure \
$(HOST_CONFIGARGS) $${srcdiroption} \
- [+stage_configure_flags+] [+extra_configure_flags+] && \
- $(STAMP) ../configure-stage[+id+]-[+module+]
+ [+stage_configure_flags+] [+extra_configure_flags+]
maybe-all-stage[+id+]-[+module+]: all-stage[+id+]-[+module+]
all-stage[+id+]-[+module+]: configure-stage[+id+]-[+module+]
- $(MAKE) stage[+id+]-start
+ @$(MAKE) stage[+id+]-start
@r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; [+ IF prev +] \
$(STAGE_HOST_EXPORTS) [+ ELSE prev +] \
@@ -1454,8 +1453,7 @@ all-stage[+id+]-[+module+]: configure-stage[+id+]-[+module+]
cd [+module+] && \
$(MAKE) $(FLAGS_TO_PASS) [+ IF prev +] \
$(POSTSTAGE1_FLAGS_TO_PASS) [+ ENDIF prev +] \
- [+stage_make_flags+] [+extra_make_flags+] && \
- $(STAMP) ../all-stage[+id+]-[+module+]
+ [+stage_make_flags+] [+extra_make_flags+]
@endif [+module+]-bootstrap
[+ ENDIF bootstrap +][+ ENDFOR host_modules +]
@@ -1463,8 +1461,12 @@ all-stage[+id+]-[+module+]: configure-stage[+id+]-[+module+]
# only possibility, but now it conflicts with no-bootstrap rules
@if gcc-bootstrap
[+ IF compare-target +]
-[+compare-target+]: all-stage[+id+]-gcc
- [ -f stage_current ] && $(MAKE) `cat stage_current`-end || :
+[+compare-target+]:
+ @if test -f stage[+prev+]-lean; then \
+ echo Cannot compare object files as stage [+prev+] was deleted. ; \
+ exit 0 ; \
+ fi; \
+ [ -f stage_current ] && $(MAKE) `cat stage_current`-end || : ; \
@r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
rm -f .bad_compare ; \
@@ -1483,49 +1485,23 @@ all-stage[+id+]-[+module+]: configure-stage[+id+]-[+module+]
else \
true; \
fi ; \
- $(STAMP) [+compare-target+]
+ $(STAMP) [+compare-target+][+ IF prev +]
+ @bootstrap_lean@-rm -rf stage[+prev+]-* ; $(STAMP) stage[+prev+]-lean[+ ENDIF prev +]
[+ ENDIF compare-target +]
[+ IF bootstrap-target +]
.PHONY: [+bootstrap-target+]
-[+bootstrap-target+]: stage[+id+]-bubble [+
- IF compare-target +] [+compare-target+] [+
- ENDIF compare-target +] all
+[+bootstrap-target+]: stage[+id+]-bubble [+compare-target+] all
[+ ENDIF bootstrap-target +]
-.PHONY: restage[+id+] touch-stage[+id+] distclean-stage[+id+]
+.PHONY: distclean-stage[+id+]
# Rules to wipe a stage and all the following ones, used for cleanstrap
[+ IF prev +]distclean-stage[+prev+]:: distclean-stage[+id+] [+ ENDIF prev +]
distclean-stage[+id+]::
[ -f stage_current ] && $(MAKE) `cat stage_current`-end || :
- rm -rf configure-stage[+id+]-* all-stage[+id+]-* stage[+id+]-* [+
- IF compare-target +][+compare-target+] [+ ENDIF compare-target +]
-
-# Rules to renew the timestamp on a stage and all the following ones
-[+ IF prev +]touch-stage[+prev+]:: touch-stage[+id+] [+ ENDIF prev +]
-touch-stage[+id+]::
- @case `echo configure-stage[+id+]-*` in \
- 'configure-stage[+id+]-*') ;; \
- *) \
- echo '$(STAMP)' configure-stage[+id+]-* && \
- $(STAMP) configure-stage[+id+]-* ;; \
- esac ; \
- case `echo all-stage[+id+]-*` in \
- 'all-stage[+id+]-*') ;; \
- *) \
- echo '$(STAMP)' all-stage[+id+]-* && \
- $(STAMP) all-stage[+id+]-* ;; \
- esac
-
-# After building a stage, touch the following ones
-[+ IF prev +]restage[+prev+]:: touch-stage[+id+] [+ ENDIF prev +]
-restage[+id+]::
- rm -rf all-stage[+id+]-* [+
+ rm -rf stage[+id+]-* [+
IF compare-target +][+compare-target+] [+ ENDIF compare-target +]
- $(MAKE) $(RECURSE_FLAGS_TO_PASS) [+
- IF compare-target +][+compare-target+] [+
- ELSE +] all-stage[+id+] [+ ENDIF compare-target +]
[+ IF cleanstrap-target +]
.PHONY: [+cleanstrap-target+]
diff --git a/configure b/configure
index 90fc7d4..f76883b 100755
--- a/configure
+++ b/configure
@@ -24,7 +24,7 @@ ac_help="$ac_help
ac_help="$ac_help
--with-gmp=PATH Specify directory for installed GMP library"
ac_help="$ac_help
- --enable-bootstrap Enable bootstrapping [no]"
+ --enable-bootstrap[=lean] Enable bootstrapping [no]"
ac_help="$ac_help
--enable-serial-[{host,target,build}-]configure
Force sequential configuration of
@@ -2356,6 +2356,7 @@ if test -d ${srcdir}/gcc; then
new_enable_languages=c
missing_languages=`echo ",$enable_languages," | sed -e s/,all,/,/ -e s/,c,/,/ `
+ potential_languages=c
for lang_frag in ${srcdir}/gcc/*/config-lang.in .. ; do
case ${lang_frag} in
@@ -2371,14 +2372,15 @@ if test -d ${srcdir}/gcc; then
lang_dirs=
boot_language=
build_by_default=
- need_gmp=
+ need_gmp=
. ${lang_frag}
+ potential_languages="${potential_languages},${language}"
# This is quite sensitive to the ordering of the case statement arms.
case ,${enable_languages},:${language}:${have_gnat}:${build_by_default} in
*::*:*)
echo "${lang_frag} doesn't set \$language." 1>&2
exit 1
- ;;
+ ;;
*:ada:no:*)
# Ada was requested with no preexisting GNAT. Disable unconditionally.
add_this_lang=no
@@ -2389,9 +2391,9 @@ if test -d ${srcdir}/gcc; then
;;
*,all,*:*:*:no)
# 'all' was selected, but this is not a default language
- # so do not include it.
+ # so do not include it.
add_this_lang=no
- ;;
+ ;;
*,all,*:*:*:*)
# 'all' was selected and this is a default language; include it.
add_this_lang=yes
@@ -2401,10 +2403,17 @@ if test -d ${srcdir}/gcc; then
;;
esac
- # Disable language that need GMP if it isn't available.
- if test x"$need_gmp" = xyes && test x"$have_gmp" = xno; then
- add_this_lang=no
- fi
+ # Disable languages that need GMP if it isn't available.
+ case ,${enable_languages},:${have_gmp}:${need_gmp} in
+ *,${language},*:no:yes)
+ # Specifically requested language; tell them.
+ { echo "configure: error: GMP with MPFR support is required to build $language" 1>&2; exit 1; }
+ ;;
+ *:no:yes)
+ # Silently disable.
+ add_this_lang=no
+ ;;
+ esac
case $add_this_lang in
no)
@@ -2429,7 +2438,8 @@ if test -d ${srcdir}/gcc; then
missing_languages=`echo "$missing_languages" | sed -e "s/^,//" -e "s/,$//"`
if test "x$missing_languages" != x; then
{ echo "configure: error:
-The following requested languages were not found: ${missing_languages}" 1>&2; exit 1; }
+The following requested languages were not found: ${missing_languages}
+The available languages are: ${potential_languages}" 1>&2; exit 1; }
fi
if test "x$new_enable_languages" != "x$enable_languages"; then
@@ -2755,7 +2765,7 @@ do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2759: checking for $ac_word" >&5
+echo "configure:2769: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_CONFIGURED_BISON'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -2790,7 +2800,7 @@ do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2794: checking for $ac_word" >&5
+echo "configure:2804: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_CONFIGURED_YACC'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -2825,7 +2835,7 @@ do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2829: checking for $ac_word" >&5
+echo "configure:2839: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_CONFIGURED_M4'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -2860,7 +2870,7 @@ do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2864: checking for $ac_word" >&5
+echo "configure:2874: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_CONFIGURED_FLEX'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -2895,7 +2905,7 @@ do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2899: checking for $ac_word" >&5
+echo "configure:2909: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_CONFIGURED_LEX'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -2930,7 +2940,7 @@ do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:2934: checking for $ac_word" >&5
+echo "configure:2944: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_CONFIGURED_MAKEINFO'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -3088,23 +3098,56 @@ if test "${enable_bootstrap+set}" = set; then
enableval="$enable_bootstrap"
:
else
- enable_bootstrap=no
+ enable_bootstrap=default
fi
-if test -d ${srcdir}/gcc; then
- case "$host:$target:$enable_bootstrap" in
- $build:$build:yes | *:no) ;;
- *:yes) { echo "configure: error: cannot bootstrap a cross-compiler" 1>&2; exit 1; } ;;
- *) { echo "configure: error: invalid option for --enable-bootstrap" 1>&2; exit 1; } ;;
- esac
-else
- if test $enable_bootstrap = yes; then
- { echo "configure: error: cannot bootstrap without a compiler" 1>&2; exit 1; }
- fi
-fi
+# Issue errors and warnings for invalid/strange bootstrap combinations.
+case "$configdirs" in
+ *gcc*) have_compiler=yes ;;
+ *) have_compiler=no ;;
+esac
+
+case "$have_compiler:$host:$target:$enable_bootstrap" in
+ *:*:*:no) ;;
+
+ # Default behavior. (We'll) enable bootstrap if we have a compiler
+ # and we are in a native configuration.
+ yes:$build:$build:default)
+ # This will become 'yes'
+ enable_bootstrap=no ;;
+
+ *:*:*:default)
+ enable_bootstrap=no ;;
+
+ # We have a compiler and we are in a native configuration, bootstrap is ok
+ yes:$build:$build:yes | yes:$build:$build:lean)
+ ;;
+
+ # Other configurations, but we have a compiler. Assume the user knows
+ # what he's doing.
+ yes:*:*:yes | yes:*:*:lean)
+ echo "configure: warning: trying to bootstrap a cross compiler" 1>&2
+ ;;
+
+ # No compiler: if they passed --enable-bootstrap explicitly, fail
+ no:*:*:yes | no:*:*:lean)
+ { echo "configure: error: cannot bootstrap without a compiler" 1>&2; exit 1; } ;;
+
+ # Fail if wrong command line
+ *)
+ { echo "configure: error: invalid option for --enable-bootstrap" 1>&2; exit 1; }
+ ;;
+esac
+
+# Adjust the toplevel makefile according to whether bootstrap was selected.
case "$enable_bootstrap" in
yes)
+ bootstrap_lean='#'
+ default_target=bootstrap
+ bootstrap_suffix=bootstrap ;;
+ lean)
+ bootstrap_lean=''
default_target=bootstrap
bootstrap_suffix=bootstrap ;;
no)
@@ -3113,6 +3156,7 @@ case "$enable_bootstrap" in
esac
+
for module in ${build_configdirs} ; do
if test -z "${no_recursion}" \
&& test -f ${build_subdir}/${module}/Makefile; then
@@ -3530,7 +3574,7 @@ test -n "$target_alias" && ncn_target_tool_prefix=$target_alias-
# Extract the first word of "${ncn_tool_prefix}ar", so it can be a program name with args.
set dummy ${ncn_tool_prefix}ar; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3534: checking for $ac_word" >&5
+echo "configure:3578: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_AR'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -3563,7 +3607,7 @@ if test -z "$ac_cv_prog_AR" ; then
# Extract the first word of "ar", so it can be a program name with args.
set dummy ar; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3567: checking for $ac_word" >&5
+echo "configure:3611: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_AR'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -3602,7 +3646,7 @@ fi
# Extract the first word of "${ncn_tool_prefix}as", so it can be a program name with args.
set dummy ${ncn_tool_prefix}as; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3606: checking for $ac_word" >&5
+echo "configure:3650: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_AS'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -3635,7 +3679,7 @@ if test -z "$ac_cv_prog_AS" ; then
# Extract the first word of "as", so it can be a program name with args.
set dummy as; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3639: checking for $ac_word" >&5
+echo "configure:3683: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_AS'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -3674,7 +3718,7 @@ fi
# Extract the first word of "${ncn_tool_prefix}dlltool", so it can be a program name with args.
set dummy ${ncn_tool_prefix}dlltool; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3678: checking for $ac_word" >&5
+echo "configure:3722: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_DLLTOOL'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -3707,7 +3751,7 @@ if test -z "$ac_cv_prog_DLLTOOL" ; then
# Extract the first word of "dlltool", so it can be a program name with args.
set dummy dlltool; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3711: checking for $ac_word" >&5
+echo "configure:3755: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_DLLTOOL'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -3746,7 +3790,7 @@ fi
# Extract the first word of "${ncn_tool_prefix}ld", so it can be a program name with args.
set dummy ${ncn_tool_prefix}ld; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3750: checking for $ac_word" >&5
+echo "configure:3794: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_LD'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -3779,7 +3823,7 @@ if test -z "$ac_cv_prog_LD" ; then
# Extract the first word of "ld", so it can be a program name with args.
set dummy ld; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3783: checking for $ac_word" >&5
+echo "configure:3827: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_LD'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -3818,7 +3862,7 @@ fi
# Extract the first word of "${ncn_tool_prefix}nm", so it can be a program name with args.
set dummy ${ncn_tool_prefix}nm; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3822: checking for $ac_word" >&5
+echo "configure:3866: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_NM'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -3851,7 +3895,7 @@ if test -z "$ac_cv_prog_NM" ; then
# Extract the first word of "nm", so it can be a program name with args.
set dummy nm; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3855: checking for $ac_word" >&5
+echo "configure:3899: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_NM'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -3890,7 +3934,7 @@ fi
# Extract the first word of "${ncn_tool_prefix}ranlib", so it can be a program name with args.
set dummy ${ncn_tool_prefix}ranlib; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3894: checking for $ac_word" >&5
+echo "configure:3938: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -3923,7 +3967,7 @@ if test -z "$ac_cv_prog_RANLIB" ; then
# Extract the first word of "ranlib", so it can be a program name with args.
set dummy ranlib; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3927: checking for $ac_word" >&5
+echo "configure:3971: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_RANLIB'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -3962,7 +4006,7 @@ fi
# Extract the first word of "${ncn_tool_prefix}windres", so it can be a program name with args.
set dummy ${ncn_tool_prefix}windres; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3966: checking for $ac_word" >&5
+echo "configure:4010: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_WINDRES'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -3995,7 +4039,7 @@ if test -z "$ac_cv_prog_WINDRES" ; then
# Extract the first word of "windres", so it can be a program name with args.
set dummy windres; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:3999: checking for $ac_word" >&5
+echo "configure:4043: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_WINDRES'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -4034,7 +4078,7 @@ fi
# Extract the first word of "${ncn_tool_prefix}objcopy", so it can be a program name with args.
set dummy ${ncn_tool_prefix}objcopy; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4038: checking for $ac_word" >&5
+echo "configure:4082: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_OBJCOPY'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -4067,7 +4111,7 @@ if test -z "$ac_cv_prog_OBJCOPY" ; then
# Extract the first word of "objcopy", so it can be a program name with args.
set dummy objcopy; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4071: checking for $ac_word" >&5
+echo "configure:4115: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_OBJCOPY'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -4106,7 +4150,7 @@ fi
# Extract the first word of "${ncn_tool_prefix}objdump", so it can be a program name with args.
set dummy ${ncn_tool_prefix}objdump; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4110: checking for $ac_word" >&5
+echo "configure:4154: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_OBJDUMP'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -4139,7 +4183,7 @@ if test -z "$ac_cv_prog_OBJDUMP" ; then
# Extract the first word of "objdump", so it can be a program name with args.
set dummy objdump; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4143: checking for $ac_word" >&5
+echo "configure:4187: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_OBJDUMP'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -4185,7 +4229,7 @@ fi
# Extract the first word of "${ncn_target_tool_prefix}ar", so it can be a program name with args.
set dummy ${ncn_target_tool_prefix}ar; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4189: checking for $ac_word" >&5
+echo "configure:4233: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_CONFIGURED_AR_FOR_TARGET'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -4218,7 +4262,7 @@ if test -z "$ac_cv_prog_CONFIGURED_AR_FOR_TARGET" ; then
# Extract the first word of "ar", so it can be a program name with args.
set dummy ar; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4222: checking for $ac_word" >&5
+echo "configure:4266: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_CONFIGURED_AR_FOR_TARGET'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -4257,7 +4301,7 @@ fi
# Extract the first word of "${ncn_target_tool_prefix}as", so it can be a program name with args.
set dummy ${ncn_target_tool_prefix}as; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4261: checking for $ac_word" >&5
+echo "configure:4305: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_CONFIGURED_AS_FOR_TARGET'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -4290,7 +4334,7 @@ if test -z "$ac_cv_prog_CONFIGURED_AS_FOR_TARGET" ; then
# Extract the first word of "as", so it can be a program name with args.
set dummy as; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4294: checking for $ac_word" >&5
+echo "configure:4338: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_CONFIGURED_AS_FOR_TARGET'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -4329,7 +4373,7 @@ fi
# Extract the first word of "${ncn_target_tool_prefix}dlltool", so it can be a program name with args.
set dummy ${ncn_target_tool_prefix}dlltool; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4333: checking for $ac_word" >&5
+echo "configure:4377: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_CONFIGURED_DLLTOOL_FOR_TARGET'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -4362,7 +4406,7 @@ if test -z "$ac_cv_prog_CONFIGURED_DLLTOOL_FOR_TARGET" ; then
# Extract the first word of "dlltool", so it can be a program name with args.
set dummy dlltool; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4366: checking for $ac_word" >&5
+echo "configure:4410: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_CONFIGURED_DLLTOOL_FOR_TARGET'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -4401,7 +4445,7 @@ fi
# Extract the first word of "${ncn_target_tool_prefix}ld", so it can be a program name with args.
set dummy ${ncn_target_tool_prefix}ld; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4405: checking for $ac_word" >&5
+echo "configure:4449: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_CONFIGURED_LD_FOR_TARGET'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -4434,7 +4478,7 @@ if test -z "$ac_cv_prog_CONFIGURED_LD_FOR_TARGET" ; then
# Extract the first word of "ld", so it can be a program name with args.
set dummy ld; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4438: checking for $ac_word" >&5
+echo "configure:4482: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_CONFIGURED_LD_FOR_TARGET'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -4473,7 +4517,7 @@ fi
# Extract the first word of "${ncn_target_tool_prefix}nm", so it can be a program name with args.
set dummy ${ncn_target_tool_prefix}nm; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4477: checking for $ac_word" >&5
+echo "configure:4521: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_CONFIGURED_NM_FOR_TARGET'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -4506,7 +4550,7 @@ if test -z "$ac_cv_prog_CONFIGURED_NM_FOR_TARGET" ; then
# Extract the first word of "nm", so it can be a program name with args.
set dummy nm; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4510: checking for $ac_word" >&5
+echo "configure:4554: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_CONFIGURED_NM_FOR_TARGET'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -4545,7 +4589,7 @@ fi
# Extract the first word of "${ncn_target_tool_prefix}ranlib", so it can be a program name with args.
set dummy ${ncn_target_tool_prefix}ranlib; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4549: checking for $ac_word" >&5
+echo "configure:4593: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_CONFIGURED_RANLIB_FOR_TARGET'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -4578,7 +4622,7 @@ if test -z "$ac_cv_prog_CONFIGURED_RANLIB_FOR_TARGET" ; then
# Extract the first word of "ranlib", so it can be a program name with args.
set dummy ranlib; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4582: checking for $ac_word" >&5
+echo "configure:4626: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_CONFIGURED_RANLIB_FOR_TARGET'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -4617,7 +4661,7 @@ fi
# Extract the first word of "${ncn_target_tool_prefix}windres", so it can be a program name with args.
set dummy ${ncn_target_tool_prefix}windres; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4621: checking for $ac_word" >&5
+echo "configure:4665: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_CONFIGURED_WINDRES_FOR_TARGET'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -4650,7 +4694,7 @@ if test -z "$ac_cv_prog_CONFIGURED_WINDRES_FOR_TARGET" ; then
# Extract the first word of "windres", so it can be a program name with args.
set dummy windres; ac_word=$2
echo $ac_n "checking for $ac_word""... $ac_c" 1>&6
-echo "configure:4654: checking for $ac_word" >&5
+echo "configure:4698: checking for $ac_word" >&5
if eval "test \"`echo '$''{'ac_cv_prog_ncn_cv_CONFIGURED_WINDRES_FOR_TARGET'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -4735,7 +4779,7 @@ RANLIB_FOR_TARGET=${RANLIB_FOR_TARGET}${extra_ranlibflags_for_target}
NM_FOR_TARGET=${NM_FOR_TARGET}${extra_nmflags_for_target}
echo $ac_n "checking whether to enable maintainer-specific portions of Makefiles""... $ac_c" 1>&6
-echo "configure:4739: checking whether to enable maintainer-specific portions of Makefiles" >&5
+echo "configure:4783: checking whether to enable maintainer-specific portions of Makefiles" >&5
# Check whether --enable-maintainer-mode or --disable-maintainer-mode was given.
if test "${enable_maintainer_mode+set}" = set; then
enableval="$enable_maintainer_mode"
@@ -4779,10 +4823,10 @@ esac
# It makes debugging easier if we create as symlinks the stage directories
-# gcc for stageN-gcc and stage-prev for stage(N-1). In case this is not
+# gcc for stageN-gcc and stagePREV-gcc for stage(N-1). In case this is not
# possible, however, we can resort to mv.
echo $ac_n "checking if symbolic links between directories work""... $ac_c" 1>&6
-echo "configure:4786: checking if symbolic links between directories work" >&5
+echo "configure:4830: checking if symbolic links between directories work" >&5
if eval "test \"`echo '$''{'gcc_cv_prog_ln_s_dir'+set}'`\" = set"; then
echo $ac_n "(cached) $ac_c" 1>&6
else
@@ -5011,6 +5055,7 @@ s%@CONFIGURED_M4@%$CONFIGURED_M4%g
s%@CONFIGURED_FLEX@%$CONFIGURED_FLEX%g
s%@CONFIGURED_LEX@%$CONFIGURED_LEX%g
s%@CONFIGURED_MAKEINFO@%$CONFIGURED_MAKEINFO%g
+s%@bootstrap_lean@%$bootstrap_lean%g
s%@default_target@%$default_target%g
/@serialization_dependencies@/r $serialization_dependencies
s%@serialization_dependencies@%%g
diff --git a/configure.in b/configure.in
index c84dc42..080ac0d 100644
--- a/configure.in
+++ b/configure.in
@@ -1161,6 +1161,7 @@ if test -d ${srcdir}/gcc; then
new_enable_languages=c
missing_languages=`echo ",$enable_languages," | sed -e s/,all,/,/ -e s/,c,/,/ `
+ potential_languages=c
for lang_frag in ${srcdir}/gcc/*/config-lang.in .. ; do
case ${lang_frag} in
@@ -1176,14 +1177,15 @@ if test -d ${srcdir}/gcc; then
lang_dirs=
boot_language=
build_by_default=
- need_gmp=
+ need_gmp=
. ${lang_frag}
+ potential_languages="${potential_languages},${language}"
# This is quite sensitive to the ordering of the case statement arms.
case ,${enable_languages},:${language}:${have_gnat}:${build_by_default} in
*::*:*)
echo "${lang_frag} doesn't set \$language." 1>&2
exit 1
- ;;
+ ;;
*:ada:no:*)
# Ada was requested with no preexisting GNAT. Disable unconditionally.
add_this_lang=no
@@ -1194,9 +1196,9 @@ if test -d ${srcdir}/gcc; then
;;
*,all,*:*:*:no)
# 'all' was selected, but this is not a default language
- # so do not include it.
+ # so do not include it.
add_this_lang=no
- ;;
+ ;;
*,all,*:*:*:*)
# 'all' was selected and this is a default language; include it.
add_this_lang=yes
@@ -1206,10 +1208,17 @@ if test -d ${srcdir}/gcc; then
;;
esac
- # Disable language that need GMP if it isn't available.
- if test x"$need_gmp" = xyes && test x"$have_gmp" = xno; then
- add_this_lang=no
- fi
+ # Disable languages that need GMP if it isn't available.
+ case ,${enable_languages},:${have_gmp}:${need_gmp} in
+ *,${language},*:no:yes)
+ # Specifically requested language; tell them.
+ AC_MSG_ERROR([GMP with MPFR support is required to build $language])
+ ;;
+ *:no:yes)
+ # Silently disable.
+ add_this_lang=no
+ ;;
+ esac
case $add_this_lang in
no)
@@ -1234,7 +1243,8 @@ if test -d ${srcdir}/gcc; then
missing_languages=`echo "$missing_languages" | sed -e "s/^,//" -e "s/,$//"`
if test "x$missing_languages" != x; then
AC_MSG_ERROR([
-The following requested languages were not found: ${missing_languages}])
+The following requested languages were not found: ${missing_languages}
+The available languages are: ${potential_languages}])
fi
if test "x$new_enable_languages" != "x$enable_languages"; then
@@ -1685,28 +1695,62 @@ esac
# not to nest @if/@endif pairs, because configure will not warn you at all.
AC_ARG_ENABLE([bootstrap],
-[ --enable-bootstrap Enable bootstrapping [no]],,
-enable_bootstrap=no)
-if test -d ${srcdir}/gcc; then
- case "$host:$target:$enable_bootstrap" in
- $build:$build:yes | *:no) ;;
- *:yes) AC_MSG_ERROR([cannot bootstrap a cross-compiler]) ;;
- *) AC_MSG_ERROR([invalid option for --enable-bootstrap]) ;;
- esac
-else
- if test $enable_bootstrap = yes; then
- AC_MSG_ERROR([cannot bootstrap without a compiler])
- fi
-fi
+[ --enable-bootstrap[=lean] Enable bootstrapping [no]],,
+enable_bootstrap=default)
+
+# Issue errors and warnings for invalid/strange bootstrap combinations.
+case "$configdirs" in
+ *gcc*) have_compiler=yes ;;
+ *) have_compiler=no ;;
+esac
+
+case "$have_compiler:$host:$target:$enable_bootstrap" in
+ *:*:*:no) ;;
+
+ # Default behavior. (We'll) enable bootstrap if we have a compiler
+ # and we are in a native configuration.
+ yes:$build:$build:default)
+ # This will become 'yes'
+ enable_bootstrap=no ;;
+
+ *:*:*:default)
+ enable_bootstrap=no ;;
+
+ # We have a compiler and we are in a native configuration, bootstrap is ok
+ yes:$build:$build:yes | yes:$build:$build:lean)
+ ;;
+
+ # Other configurations, but we have a compiler. Assume the user knows
+ # what he's doing.
+ yes:*:*:yes | yes:*:*:lean)
+ AC_MSG_WARN([trying to bootstrap a cross compiler])
+ ;;
+ # No compiler: if they passed --enable-bootstrap explicitly, fail
+ no:*:*:yes | no:*:*:lean)
+ AC_MSG_ERROR([cannot bootstrap without a compiler]) ;;
+
+ # Fail if wrong command line
+ *)
+ AC_MSG_ERROR([invalid option for --enable-bootstrap])
+ ;;
+esac
+
+# Adjust the toplevel makefile according to whether bootstrap was selected.
case "$enable_bootstrap" in
yes)
+ bootstrap_lean='#'
+ default_target=bootstrap
+ bootstrap_suffix=bootstrap ;;
+ lean)
+ bootstrap_lean=''
default_target=bootstrap
bootstrap_suffix=bootstrap ;;
no)
default_target=all
bootstrap_suffix=no-bootstrap ;;
esac
+AC_SUBST(bootstrap_lean)
AC_SUBST(default_target)
for module in ${build_configdirs} ; do
@@ -2230,7 +2274,7 @@ esac
AC_SUBST(stage1_cflags)
# It makes debugging easier if we create as symlinks the stage directories
-# gcc for stageN-gcc and stage-prev for stage(N-1). In case this is not
+# gcc for stageN-gcc and stagePREV-gcc for stage(N-1). In case this is not
# possible, however, we can resort to mv.
AC_CACHE_CHECK([if symbolic links between directories work],
[gcc_cv_prog_ln_s_dir],