X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Makefile;h=f1fefca0c63767b4c10faa0808ac269a16f1b3d3;hb=6c2ae9c152d147623ac45a5fe52534c99d6ba835;hp=e71fe189adb84819d602ba96ff8ac0c67ccd641f;hpb=0d43cb1bcb0463f3a84d47e2bea66970cf9f8bca;p=ghc-hetmet.git diff --git a/Makefile b/Makefile index e71fe18..f1fefca 100644 --- a/Makefile +++ b/Makefile @@ -102,7 +102,6 @@ endif stage1 : $(GCC_LIB_DEP) check-all $(MAKE) -C libraries boot $(MAKE) -C gmp all - $(MAKE) -C libffi all $(MAKE) -C utils/mkdependC boot $(MAKE) -C utils with-bootstrapping-compiler @case '${MFLAGS}' in *-[ik]*) x_on_err=0;; *-r*[ik]*) x_on_err=0;; *) x_on_err=1;; esac; \ @@ -122,6 +121,7 @@ stage1 : $(GCC_LIB_DEP) check-all $(MAKE) --no-print-directory -C $$i $(MFLAGS) all; \ if [ $$? -eq 0 -o $$x_on_err -eq 0 ] ; then true; else exit 1; fi; \ done + $(MAKE) -C libffi all $(MAKE) -C rts boot $(MAKE) -C rts $(MAKE) -C libraries all @@ -573,11 +573,11 @@ ifneq "$(PublishLocation)" "" dist :: @for i in 0 1 2 3 4 5 6 7 8 9; do \ echo "Try $$i: $(PublishCp) $(SRC_DIST_EXTRALIBS_TARBALL) $(PublishLocation)/dist"; \ - if $(PublishCp) $(SRC_DIST_EXTRALIBS_TARBALL) $(PublishLocation)/dist; then break; fi\ + if $(PublishCp) $(SRC_DIST_EXTRALIBS_TARBALL) $(PublishLocation)/dist; then break; fi; \ done @for i in 0 1 2 3 4 5 6 7 8 9; do \ echo "Try $$i: $(PublishCp) $(SRC_DIST_TARBALL) $(PublishLocation)/dist"; \ - if $(PublishCp) $(SRC_DIST_TARBALL) $(PublishLocation)/dist; then break; fi\ + if $(PublishCp) $(SRC_DIST_TARBALL) $(PublishLocation)/dist; then break; fi; \ done endif