X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Makefile;h=23c0a74f90dc4199e1135f0f5cd80dad0c9051dd;hb=a11bb49b97eaba892730baf1565e922715dbc07f;hp=e6d9866ed0edcec532d71a795c577ce38e2238d2;hpb=dab5f1b5a1df0fdff2c9942ca311616ad472adcd;p=ghc-hetmet.git

diff --git a/Makefile b/Makefile
index e6d9866..23c0a74 100644
--- a/Makefile
+++ b/Makefile
@@ -67,12 +67,12 @@ include $(TOP)/mk/boilerplate.mk
 
 # We can't 'make boot' in libraries until stage1 is built
 ifeq "$(BootingFromHc)" "YES"
-SUBDIRS_BUILD = gmp includes rts compat compiler docs utils driver
+SUBDIRS_BUILD = gmp libffi includes rts compat compiler docs utils driver
 else
-SUBDIRS_BUILD = gmp includes compat utils driver docs compiler rts libraries/Cabal/doc
+SUBDIRS_BUILD = gmp libffi includes compat utils driver docs compiler rts libraries/Cabal/doc
 endif
 
-SUBDIRS = gmp includes compat utils driver docs rts libraries compiler libraries/Cabal/doc
+SUBDIRS = gmp libffi includes compat utils driver docs rts libraries compiler libraries/Cabal/doc
 
 # Sanity check that all the boot libraries are in the tree, to catch
 # failure to run darcs-all.
@@ -98,7 +98,6 @@ endif
 endif
 
 stage1 : $(GCC_LIB_DEP) check-packages
-	$(MAKE) -C utils mostlyclean
 	$(MAKE) -C utils/mkdependC boot
 	@case '${MFLAGS}' in *-[ik]*) x_on_err=0;; *-r*[ik]*) x_on_err=0;; *) x_on_err=1;; esac; \
 	for i in $(SUBDIRS_BUILD); do \
@@ -128,14 +127,8 @@ stage1 : $(GCC_LIB_DEP) check-packages
 # compiler of all utils that get installed and of all extra support binaries
 # includes in binary dists.
 stage2 : check-packages
-	$(MAKE) -C utils mostlyclean
-	$(MAKE) -C utils stage=2
 	$(MAKE) -C compiler boot stage=2
 	$(MAKE) -C compiler stage=2
-	$(RM) -f libraries/ifBuildable/ifBuildable
-	$(MAKE) -C libraries stage=2 ifBuildable/ifBuildable
-	$(RM) -f libraries/installPackage/installPackage
-	$(MAKE) -C libraries stage=2 installPackage/installPackage
 
 
 stage3 : check-packages