diff options
author | Paolo Bonzini <bonzini@gnu.org> | 2006-11-17 10:35:45 +0000 |
---|---|---|
committer | Paolo Bonzini <bonzini@gnu.org> | 2006-11-17 10:35:45 +0000 |
commit | d17c1ab63aa989f90a3305f8e9d1314185699b0c (patch) | |
tree | 6e2ad0c679b70deb34d3172de15fb5329576c736 /Makefile.tpl | |
parent | 56a2f6d47231b0e4159d085acc07a0f115f5d264 (diff) | |
download | gdb-d17c1ab63aa989f90a3305f8e9d1314185699b0c.tar.gz |
2006-11-16 Paolo Bonzini <bonzini@gnu.org>
* Makefile.tpl (clean-target-libgcc): Test for gcc Makefile presence.
(unstage): Test for stage_last presence.
PR bootstrap/29802
* Makefile.tpl (POSTSTAGE1_FLAGS_TO_PASS): Add HOST_SUBDIR in STAGE_PREFIX.
* Makefile.in: Regenerate.
Diffstat (limited to 'Makefile.tpl')
-rw-r--r-- | Makefile.tpl | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Makefile.tpl b/Makefile.tpl index 5ce38abd853..7e9cb79d43f 100644 --- a/Makefile.tpl +++ b/Makefile.tpl @@ -591,7 +591,7 @@ realclean: maintainer-clean # Extra dependency for clean-target, owing to the mixed nature of gcc. clean-target: clean-target-libgcc clean-target-libgcc: - test ! -d gcc || (cd gcc && $(MAKE) $@) + if test -f gcc/Makefile; then cd gcc && $(MAKE) $@; else :; fi # Check target. @@ -1215,7 +1215,7 @@ stage = : current_stage = "" @if gcc-bootstrap -unstage = [ -f stage_current ] || $(MAKE) `cat stage_last`-start +unstage = if [ -f stage_last ]; then [ -f stage_current ] || $(MAKE) `cat stage_last`-start || exit 1; else :; fi stage = if [ -f stage_current ]; then $(MAKE) `cat stage_current`-end || exit 1; else :; fi current_stage = "`cat stage_current 2> /dev/null`" @endif gcc-bootstrap @@ -1258,7 +1258,7 @@ objext = .o # Flags to pass to stage2 and later makes. POSTSTAGE1_FLAGS_TO_PASS = \ CC="$${CC}" CC_FOR_BUILD="$${CC_FOR_BUILD}" \ - STAGE_PREFIX=$$r/prev-gcc/ \ + STAGE_PREFIX="$$r/$(HOST_SUBDIR)/prev-gcc/" \ CFLAGS="$(BOOT_CFLAGS)" \ LIBCFLAGS="$(BOOT_CFLAGS)" \ LDFLAGS="$(BOOT_LDFLAGS)" \ |