diff options
| author | Paolo Bonzini <bonzini@gnu.org> | 2004-04-24 06:42:54 +0000 |
|---|---|---|
| committer | Paolo Bonzini <bonzini@gcc.gnu.org> | 2004-04-24 06:42:54 +0000 |
| commit | 03a917017465b056b6ee73e2303b1e194c51fd1b (patch) | |
| tree | a996c64777c789969522cec419f9d16701da0869 /Makefile.tpl | |
| parent | 44688022b31c3eafa49eaf01f542ff48d4cddc6f (diff) | |
| download | gcc-03a917017465b056b6ee73e2303b1e194c51fd1b.zip gcc-03a917017465b056b6ee73e2303b1e194c51fd1b.tar.gz gcc-03a917017465b056b6ee73e2303b1e194c51fd1b.tar.bz2 | |
Makefile.tpl (all-stage1-gcc, [...]): Always relocate gcc and prev-gcc to the original names, even if the build fails.
2004-04-23 Paolo Bonzini <bonzini@gnu.org>
* Makefile.tpl (all-stage1-gcc, all-stage2-gcc, all-stage3-gcc):
Always relocate gcc and prev-gcc to the original names, even
if the build fails.
(new-cleanstrap, new-restage1, new-restage2, new-restage3):
New targets.
From-SVN: r81130
Diffstat (limited to 'Makefile.tpl')
| -rw-r--r-- | Makefile.tpl | 40 |
1 files changed, 33 insertions, 7 deletions
diff --git a/Makefile.tpl b/Makefile.tpl index 7ae10de..d380616 100644 --- a/Makefile.tpl +++ b/Makefile.tpl @@ -1377,11 +1377,11 @@ all-stage1-gcc: configure-stage1-gcc prebootstrap mv stage1-gcc gcc ; \ cd gcc && \ $(MAKE) $(GCC_FLAGS_TO_PASS) \ - CFLAGS="$(STAGE1_CFLAGS)" \ - || exit 1 ; \ + CFLAGS="$(STAGE1_CFLAGS)" && $(STAMP) ../all-stage1-gcc ; \ + result=$$? ; \ cd .. ; \ mv gcc stage1-gcc ; \ - $(STAMP) all-stage1-gcc + exit $$result # TODO: Deal with STAGE_PREFIX (which is only for ada, incidentally) # Possibly pass --enable-werror-always (depending on --enable-werror); @@ -1453,11 +1453,12 @@ all-stage2-gcc: all-stage1-gcc configure-stage2-gcc CC="$(STAGE_CC_WRAPPER) $$r/prev-gcc/xgcc$(exeext) -B$$r/prev-gcc/ -B$(build_tooldir)/bin/" \ CC_FOR_BUILD="$(STAGE_CC_WRAPPER) $$r/prev-gcc/xgcc$(exeext) -B$$r/prev-gcc/ -B$(build_tooldir)/bin/" \ STAGE_PREFIX=$$r/prev-gcc/ \ - $(POSTSTAGE1_FLAGS_TO_PASS) || exit 1 ; \ + $(POSTSTAGE1_FLAGS_TO_PASS) && $(STAMP) ../all-stage2-gcc ; \ + result=$$? ; \ cd .. ; \ mv prev-gcc stage1-gcc ; \ mv gcc stage2-gcc ; \ - $(STAMP) all-stage2-gcc + exit $$result configure-stage3-gcc: all-stage2-gcc echo configure-stage3-gcc > stage_last ; \ @@ -1520,11 +1521,12 @@ all-stage3-gcc: all-stage2-gcc configure-stage3-gcc CC="$(STAGE_CC_WRAPPER) $$r/prev-gcc/xgcc$(exeext) -B$$r/prev-gcc/ -B$(build_tooldir)/bin/" \ CC_FOR_BUILD="$(STAGE_CC_WRAPPER) $$r/prev-gcc/xgcc$(exeext) -B$$r/prev-gcc/ -B$(build_tooldir)/bin/" \ STAGE_PREFIX=$$r/prev-gcc/ \ - $(POSTSTAGE1_FLAGS_TO_PASS) || exit 1 ; \ + $(POSTSTAGE1_FLAGS_TO_PASS) && $(STAMP) ../all-stage3-gcc \ + result=$$? ; \ cd .. ; \ mv prev-gcc stage2-gcc ; \ mv gcc stage3-gcc ; \ - $(STAMP) all-stage3-gcc + exit $$result # We only want to compare .o files, so set this! objext = .o @@ -1559,6 +1561,30 @@ new-bootstrap: compare $(MAKE) all ; \ mv gcc stage3-gcc +new-cleanstrap: + rm -rf configure-stage1-gcc all-stage1-gcc stage1-gcc \ + configure-stage2-gcc all-stage2-gcc stage2-gcc \ + configure-stage3-gcc all-stage3-gcc stage3-gcc \ + compare + $(MAKE) new-bootstrap + +new-restage1: + rm -rf all-stage1-gcc \ + configure-stage2-gcc all-stage2-gcc stage2-gcc \ + configure-stage3-gcc all-stage3-gcc stage3-gcc \ + compare + $(MAKE) all-stage1-gcc + +new-restage2: all-stage1-gcc + rm -rf all-stage2-gcc \ + configure-stage3-gcc all-stage3-gcc stage3-gcc \ + compare + $(MAKE) all-stage2-gcc + +new-restage3: all-stage2-gcc + rm -rf all-stage3-gcc compare + $(MAKE) compare + # -------------------------------------- # Dependencies between different modules # -------------------------------------- |