-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 Paolo Bonzini wrote: >>I used to be able to do: >> >> cd $BUILD_DIR/$TARGET/libjava/testsuite >> make -k check >> >>to run only the libjava testsuite. >> >>When I try the same under "stage3-$TARGET/libjava/testsuite" >>now, it fails to find the appropriate "gcj". The full error >>log is appended at the end of this message. [..] > > Try the attached patch.
Thanks for the quick patch. I did a complete bootstrap with this patch and I can confirm that I can now re-run the libjava testsuite as indicated above. Thanks, Ranjit. > Paolo > > > ------------------------------------------------------------------------ > > 2005-12-15 Paolo Bonzini <[EMAIL PROTECTED]> > > * Makefile.tpl (all, do-[+make_target+], do-check, install, > install-host-nogcc): Don't invoke $(stage) at the end. > * Makefile.in: Regenerate. > > Index: Makefile.tpl > =================================================================== > --- Makefile.tpl (revision 108564) > +++ Makefile.tpl (working copy) > @@ -497,7 +497,6 @@ all: > else \ > $(MAKE) $(RECURSE_FLAGS_TO_PASS) all-host all-target; \ > fi > - @: $(MAKE); $(stage) > > .PHONY: all-build > all-build: [+ > @@ -527,7 +526,6 @@ do-[+make_target+]: > s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ > $(MAKE) $(RECURSE_FLAGS_TO_PASS) [+make_target+]-host \ > [+make_target+]-target > - @: $(MAKE); $(stage) > > > .PHONY: [+make_target+]-host > @@ -621,7 +619,6 @@ do-check: > @r=`${PWD_COMMAND}`; export r; \ > s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ > $(MAKE) $(RECURSE_FLAGS_TO_PASS) check-host check-target > - @: $(MAKE); $(stage) > > # Automated reporting of test results. > > @@ -652,7 +649,6 @@ install: > @r=`${PWD_COMMAND}`; export r; \ > s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ > $(MAKE) $(RECURSE_FLAGS_TO_PASS) installdirs install-host install-target > - @: $(MAKE); $(stage) > > .PHONY: install-host-nogcc > install-host-nogcc: [+ > @@ -1378,7 +1374,6 @@ do-clean: clean-stage[+id+] > @r=`${PWD_COMMAND}`; export r; \ > s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ > $(MAKE) $(TARGET_FLAGS_TO_PASS) all-host all-target > - @: $(MAKE); $(stage) > [+ ENDIF bootstrap-target +] > > # Rules to wipe a stage and all the following ones, also used for cleanstrap > Index: Makefile.in > =================================================================== > --- Makefile.in (revision 108564) > +++ Makefile.in (working copy) > @@ -646,7 +646,6 @@ all: > else \ > $(MAKE) $(RECURSE_FLAGS_TO_PASS) all-host all-target; \ > fi > - @: $(MAKE); $(stage) > > .PHONY: all-build > all-build: \ > @@ -761,7 +760,6 @@ do-info: > s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ > $(MAKE) $(RECURSE_FLAGS_TO_PASS) info-host \ > info-target > - @: $(MAKE); $(stage) > > > .PHONY: info-host > @@ -864,7 +862,6 @@ do-dvi: > s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ > $(MAKE) $(RECURSE_FLAGS_TO_PASS) dvi-host \ > dvi-target > - @: $(MAKE); $(stage) > > > .PHONY: dvi-host > @@ -967,7 +964,6 @@ do-html: > s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ > $(MAKE) $(RECURSE_FLAGS_TO_PASS) html-host \ > html-target > - @: $(MAKE); $(stage) > > > .PHONY: html-host > @@ -1070,7 +1066,6 @@ do-TAGS: > s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ > $(MAKE) $(RECURSE_FLAGS_TO_PASS) TAGS-host \ > TAGS-target > - @: $(MAKE); $(stage) > > > .PHONY: TAGS-host > @@ -1173,7 +1168,6 @@ do-install-info: > s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ > $(MAKE) $(RECURSE_FLAGS_TO_PASS) install-info-host \ > install-info-target > - @: $(MAKE); $(stage) > > > .PHONY: install-info-host > @@ -1276,7 +1270,6 @@ do-installcheck: > s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ > $(MAKE) $(RECURSE_FLAGS_TO_PASS) installcheck-host \ > installcheck-target > - @: $(MAKE); $(stage) > > > .PHONY: installcheck-host > @@ -1379,7 +1372,6 @@ do-mostlyclean: > s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ > $(MAKE) $(RECURSE_FLAGS_TO_PASS) mostlyclean-host \ > mostlyclean-target > - @: $(MAKE); $(stage) > > > .PHONY: mostlyclean-host > @@ -1482,7 +1474,6 @@ do-clean: > s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ > $(MAKE) $(RECURSE_FLAGS_TO_PASS) clean-host \ > clean-target > - @: $(MAKE); $(stage) > > > .PHONY: clean-host > @@ -1585,7 +1576,6 @@ do-distclean: > s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ > $(MAKE) $(RECURSE_FLAGS_TO_PASS) distclean-host \ > distclean-target > - @: $(MAKE); $(stage) > > > .PHONY: distclean-host > @@ -1688,7 +1678,6 @@ do-maintainer-clean: > s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ > $(MAKE) $(RECURSE_FLAGS_TO_PASS) maintainer-clean-host \ > maintainer-clean-target > - @: $(MAKE); $(stage) > > > .PHONY: maintainer-clean-host > @@ -1944,7 +1933,6 @@ do-check: > @r=`${PWD_COMMAND}`; export r; \ > s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ > $(MAKE) $(RECURSE_FLAGS_TO_PASS) check-host check-target > - @: $(MAKE); $(stage) > > # Automated reporting of test results. > > @@ -1975,7 +1963,6 @@ install: > @r=`${PWD_COMMAND}`; export r; \ > s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ > $(MAKE) $(RECURSE_FLAGS_TO_PASS) installdirs install-host install-target > - @: $(MAKE); $(stage) > > .PHONY: install-host-nogcc > install-host-nogcc: \ > @@ -36150,7 +36137,6 @@ bootstrap2: > @r=`${PWD_COMMAND}`; export r; \ > s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ > $(MAKE) $(TARGET_FLAGS_TO_PASS) all-host all-target > - @: $(MAKE); $(stage) > > > # Rules to wipe a stage and all the following ones, also used for cleanstrap > @@ -36432,7 +36418,6 @@ bootstrap: > @r=`${PWD_COMMAND}`; export r; \ > s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ > $(MAKE) $(TARGET_FLAGS_TO_PASS) all-host all-target > - @: $(MAKE); $(stage) > > > # Rules to wipe a stage and all the following ones, also used for cleanstrap > @@ -36717,7 +36702,6 @@ bootstrap4: > @r=`${PWD_COMMAND}`; export r; \ > s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ > $(MAKE) $(TARGET_FLAGS_TO_PASS) all-host all-target > - @: $(MAKE); $(stage) > > > # Rules to wipe a stage and all the following ones, also used for cleanstrap > @@ -37197,7 +37181,6 @@ profiledbootstrap: > @r=`${PWD_COMMAND}`; export r; \ > s=`cd $(srcdir); ${PWD_COMMAND}`; export s; \ > $(MAKE) $(TARGET_FLAGS_TO_PASS) all-host all-target > - @: $(MAKE); $(stage) > > > # Rules to wipe a stage and all the following ones, also used for cleanstrap - -- Ranjit Mathew Email: rmathew AT gmail DOT com Bangalore, INDIA. Web: http://ranjitmathew.hostingzero.com/ -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.2 (MingW32) Comment: Using GnuPG with Thunderbird - http://enigmail.mozdev.org iD8DBQFDoUr2Yb1hx2wRS48RAlw/AJ9mYnQVFZklcss20qJMksaLO7D88ACdFmX+ 0hlfE5j1MmvYLoRxS6EpzDE= =0dJm -----END PGP SIGNATURE-----