aboutsummaryrefslogtreecommitdiff
path: root/Makefile.tpl
diff options
context:
space:
mode:
authorPaolo Bonzini <bonzini@gnu.org>2006-11-17 10:35:45 +0000
committerPaolo Bonzini <bonzini@gnu.org>2006-11-17 10:35:45 +0000
commit9daf3993283211fd4750be1ab6216caffee61c5c (patch)
tree939567193f95a8d0883d8f0fa4ba969893ba8f85 /Makefile.tpl
parent6e953d69fb358ab3b8238dae73743080ce00c6a3 (diff)
downloadgdb-9daf3993283211fd4750be1ab6216caffee61c5c.zip
gdb-9daf3993283211fd4750be1ab6216caffee61c5c.tar.gz
gdb-9daf3993283211fd4750be1ab6216caffee61c5c.tar.bz2
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.tpl6
1 files changed, 3 insertions, 3 deletions
diff --git a/Makefile.tpl b/Makefile.tpl
index 5ce38ab..7e9cb79 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)" \