From f516a7dacf06f446b8e5d321c404a0d47702237b Mon Sep 17 00:00:00 2001 From: Paolo Bonzini Date: Tue, 1 Jun 2004 07:43:25 +0000 Subject: Makefile.tpl (all.normal): Rename to all. 2004-06-01 Paolo Bonzini * Makefile.tpl (all.normal): Rename to all. (all): Replace with a rule to pick the default target from configure. (all-gcc, configure-gcc): Use conditionals to do nothing when toplevel bootstrap is going on. (GCC directory bootstrap) [gcc-bootstrap]: Disable. (Toplevel bootstrap) [gcc-no-bootstrap]: Disable. * configure.in: Support --enable-bootstrap. * Makefile.def: Remove new- prefix from toplevel bootstrap targets. * Makefile.tpl: Likewise. * Makefile.def: Add bootstrap_stage 4. Add bootstrap2 target. * Makefile.tpl (Toplevel bootstrap): Pass $(BASE_FLAGS_TO_PASS) $(RECURSE_FLAGS) to recursive invocation of make. * Makefile.in: Regenerate. * configure: Regenerate. From-SVN: r82534 --- Makefile.def | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'Makefile.def') diff --git a/Makefile.def b/Makefile.def index 9c42596..22bdec0 100644 --- a/Makefile.def +++ b/Makefile.def @@ -222,12 +222,19 @@ bootstrap_stage = { extra_make_flags='CFLAGS="$(STAGE1_CFLAGS)"' ; }; bootstrap_stage = { id=2 ; prev=1 ; next=3 ; + bootstrap_target=new-bootstrap2 ; extra_configure_flags="@stage2_werror_flag@" ; extra_make_flags="$(POSTSTAGE1_FLAGS_TO_PASS)" ; }; bootstrap_stage = { - id=3 ; prev=2 ; + id=3 ; prev=2 ; next=4 ; compare_target=compare ; - bootstrap_target=new-bootstrap ; - cleanstrap_target=new-cleanstrap ; + bootstrap_target=bootstrap ; + cleanstrap_target=cleanstrap ; + extra_configure_flags="@stage2_werror_flag@" ; + extra_make_flags="$(POSTSTAGE1_FLAGS_TO_PASS)" ; }; +bootstrap_stage = { + id=4 ; prev=3 ; + compare_target=compare3 ; + bootstrap_target=bootstrap4 ; extra_configure_flags="@stage2_werror_flag@" ; extra_make_flags="$(POSTSTAGE1_FLAGS_TO_PASS)" ; }; -- cgit v1.1