riscv
/
binutils-gdb
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

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.
readline_5_1-import-branch
Paolo Bonzini 21 years ago
parent
cab0a0db16
commit
e360f42320
3 changed files with 83 additions and 31 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 8
      ChangeLog
  2. 84
      Makefile.in
  3. 22
      Makefile.tpl

8
ChangeLog
View File

@ -1,3 +1,11 @@
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.
2005-10-20 Eric Botcazou <ebotcazou@adacore.com>
PR bootstrap/18939

84
Makefile.in
View File

@ -1001,7 +1001,9 @@ all-target: \
.PHONY: do-info
do-info:
@$(unstage)
@$(MAKE) $(RECURSE_FLAGS_TO_PASS) info-host \
@r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(MAKE) $(RECURSE_FLAGS_TO_PASS) info-host \
info-target
@$(stage)
@ -1101,7 +1103,9 @@ info-target: \
.PHONY: do-dvi
do-dvi:
@$(unstage)
@$(MAKE) $(RECURSE_FLAGS_TO_PASS) dvi-host \
@r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(MAKE) $(RECURSE_FLAGS_TO_PASS) dvi-host \
dvi-target
@$(stage)
@ -1201,7 +1205,9 @@ dvi-target: \
.PHONY: do-html
do-html:
@$(unstage)
@$(MAKE) $(RECURSE_FLAGS_TO_PASS) html-host \
@r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(MAKE) $(RECURSE_FLAGS_TO_PASS) html-host \
html-target
@$(stage)
@ -1301,7 +1307,9 @@ html-target: \
.PHONY: do-TAGS
do-TAGS:
@$(unstage)
@$(MAKE) $(RECURSE_FLAGS_TO_PASS) TAGS-host \
@r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(MAKE) $(RECURSE_FLAGS_TO_PASS) TAGS-host \
TAGS-target
@$(stage)
@ -1401,7 +1409,9 @@ TAGS-target: \
.PHONY: do-install-info
do-install-info:
@$(unstage)
@$(MAKE) $(RECURSE_FLAGS_TO_PASS) install-info-host \
@r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(MAKE) $(RECURSE_FLAGS_TO_PASS) install-info-host \
install-info-target
@$(stage)
@ -1501,7 +1511,9 @@ install-info-target: \
.PHONY: do-installcheck
do-installcheck:
@$(unstage)
@$(MAKE) $(RECURSE_FLAGS_TO_PASS) installcheck-host \
@r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(MAKE) $(RECURSE_FLAGS_TO_PASS) installcheck-host \
installcheck-target
@$(stage)
@ -1601,7 +1613,9 @@ installcheck-target: \
.PHONY: do-mostlyclean
do-mostlyclean:
@$(unstage)
@$(MAKE) $(RECURSE_FLAGS_TO_PASS) mostlyclean-host \
@r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(MAKE) $(RECURSE_FLAGS_TO_PASS) mostlyclean-host \
mostlyclean-target
@$(stage)
@ -1701,7 +1715,9 @@ mostlyclean-target: \
.PHONY: do-clean
do-clean:
@$(unstage)
@$(MAKE) $(RECURSE_FLAGS_TO_PASS) clean-host \
@r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(MAKE) $(RECURSE_FLAGS_TO_PASS) clean-host \
clean-target
@$(stage)
@ -1801,7 +1817,9 @@ clean-target: \
.PHONY: do-distclean
do-distclean:
@$(unstage)
@$(MAKE) $(RECURSE_FLAGS_TO_PASS) distclean-host \
@r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(MAKE) $(RECURSE_FLAGS_TO_PASS) distclean-host \
distclean-target
@$(stage)
@ -1901,7 +1919,9 @@ distclean-target: \
.PHONY: do-maintainer-clean
do-maintainer-clean:
@$(unstage)
@$(MAKE) $(RECURSE_FLAGS_TO_PASS) maintainer-clean-host \
@r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
$(MAKE) $(RECURSE_FLAGS_TO_PASS) maintainer-clean-host \
maintainer-clean-target
@$(stage)
@ -2158,7 +2178,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.
@ -2187,7 +2209,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
@ -35259,7 +35283,9 @@ stage1-end::
# be reconfigured as well.
.PHONY: stage1-bubble
stage1-bubble::
@if test -f stage1-lean ; then \
@r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
if test -f stage1-lean ; then \
echo Skipping rebuild of stage1 ; \
else \
$(MAKE) stage1-start; \
@ -35443,7 +35469,9 @@ stage2-end::
# be reconfigured as well.
.PHONY: stage2-bubble
stage2-bubble:: stage1-bubble
@if test -f stage2-lean || test -f stage1-lean ; then \
@r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
if test -f stage2-lean || test -f stage1-lean ; then \
echo Skipping rebuild of stage2 ; \
else \
$(MAKE) stage2-start; \
@ -35632,7 +35660,9 @@ stage3-end::
.PHONY: stage3-bubble
stage3-bubble:: stage2-bubble
@bootstrap_lean@-rm -rf stage1-* ; $(STAMP) stage1-lean
@if test -f stage3-lean || test -f stage2-lean ; then \
@r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
if test -f stage3-lean || test -f stage2-lean ; then \
echo Skipping rebuild of stage3 ; \
else \
$(MAKE) stage3-start; \
@ -35647,13 +35677,13 @@ do-clean: clean-stage3
@if gcc-bootstrap
compare:
@if test -f stage2-lean; then \
@r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
if test -f stage2-lean; then \
echo Cannot compare object files as stage 2 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 stage3-gcc; \
files=`find . -name "*$(objext)" -print` ; \
@ -35859,7 +35889,9 @@ stage4-end::
.PHONY: stage4-bubble
stage4-bubble:: stage3-bubble
@bootstrap_lean@-rm -rf stage2-* ; $(STAMP) stage2-lean
@if test -f stage4-lean || test -f stage3-lean ; then \
@r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
if test -f stage4-lean || test -f stage3-lean ; then \
echo Skipping rebuild of stage4 ; \
else \
$(MAKE) stage4-start; \
@ -35874,13 +35906,13 @@ do-clean: clean-stage4
@if gcc-bootstrap
compare3:
@if test -f stage3-lean; then \
@r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
if test -f stage3-lean; then \
echo Cannot compare object files as stage 3 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 stage4-gcc; \
files=`find . -name "*$(objext)" -print` ; \
@ -36082,7 +36114,9 @@ stageprofile-end::
# be reconfigured as well.
.PHONY: stageprofile-bubble
stageprofile-bubble:: stage1-bubble
@if test -f stageprofile-lean || test -f stage1-lean ; then \
@r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
if test -f stageprofile-lean || test -f stage1-lean ; then \
echo Skipping rebuild of stageprofile ; \
else \
$(MAKE) stageprofile-start; \
@ -36266,7 +36300,9 @@ stagefeedback-end::
# be reconfigured as well.
.PHONY: stagefeedback-bubble
stagefeedback-bubble:: stageprofile-bubble
@if test -f stagefeedback-lean || test -f stageprofile-lean ; then \
@r=`${PWD_COMMAND}`; export r; \
s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \
if test -f stagefeedback-lean || test -f stageprofile-lean ; then \
echo Skipping rebuild of stagefeedback ; \
else \
$(MAKE) stagefeedback-start; \

22
Makefile.tpl
View File

@ -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` ; \

Write Preview
Loading…
Cancel
Save