diff options
| author | Paolo Bonzini <bonzini@gnu.org> | 2005-10-22 10:37:55 +0000 |
|---|---|---|
| committer | Paolo Bonzini <bonzini@gnu.org> | 2005-10-22 10:37:55 +0000 |
| commit | 962f34d8a27ab36a41b1ad4b68e98b24ad482203 (patch) | |
| tree | c7508ef330fbc336c0d303ee8851e05585ba09b9 /Makefile.tpl | |
| parent | 0bac565b903a767c9677343aeb966fb87acc339d (diff) | |
| download | binutils-redhat-962f34d8a27ab36a41b1ad4b68e98b24ad482203.tar.gz | |
2005-10-22 Paolo Bonzini <bonzini@gnu.org>
PR bootstrap/24297
* Makefile.tpl (do-[+make-target+], do-check, install,
stage[+id+]-bubble, [+compare-target+]): Ensure $$r and $$s
are set before recursing.
* Makefile.in: Regenerate.
Diffstat (limited to 'Makefile.tpl')
| -rw-r--r-- | Makefile.tpl | 22 |
1 files changed, 15 insertions, 7 deletions
diff --git a/Makefile.tpl b/Makefile.tpl index 47fa0c809c..0c3d75ed23 100644 --- a/Makefile.tpl +++ b/Makefile.tpl @@ -769,7 +769,9 @@ all-target: [+ .PHONY: do-[+make_target+] do-[+make_target+]: @$(unstage) - @$(MAKE) $(RECURSE_FLAGS_TO_PASS) [+make_target+]-host \ + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(MAKE) $(RECURSE_FLAGS_TO_PASS) [+make_target+]-host \ [+make_target+]-target @$(stage) @@ -866,7 +868,9 @@ check-target: [+ do-check: @$(unstage) - @$(MAKE) $(RECURSE_FLAGS_TO_PASS) check-host check-target + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(MAKE) $(RECURSE_FLAGS_TO_PASS) check-host check-target @$(stage) # Automated reporting of test results. @@ -895,7 +899,9 @@ mail-report-with-warnings.log: warning.log .PHONY: install uninstall install: @$(unstage) - @$(MAKE) $(RECURSE_FLAGS_TO_PASS) installdirs install-host install-target + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + $(MAKE) $(RECURSE_FLAGS_TO_PASS) installdirs install-host install-target @$(stage) .PHONY: install-host-nogcc @@ -1534,7 +1540,9 @@ stage[+id+]-end:: .PHONY: stage[+id+]-bubble 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 [+ + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + if test -f stage[+id+]-lean [+ IF prev +]|| test -f stage[+prev+]-lean [+ ENDIF prev +] ; then \ echo Skipping rebuild of stage[+id+] ; \ else \ @@ -1550,13 +1558,13 @@ do-clean: clean-stage[+id+] @if gcc-bootstrap [+ IF compare-target +] [+compare-target+]: - @if test -f stage[+prev+]-lean; then \ + @r=`${PWD_COMMAND}`; export r; \ + s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ + 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 ; \ cd stage[+id+]-gcc; \ files=`find . -name "*$(objext)" -print` ; \ |