X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=Makefile;h=9b670fdac54eba625fe94fcc3483135d1c405f96;hb=6a7b2fdc70ab6785006b11f2e8f7eb7fd4956a9f;hp=4d5b40e2b9e3520f443a86df961b5388dc8ffc8f;hpb=8e33ff80841bf2de0837869a9a1d15dfd1605795;p=ghc-hetmet.git

diff --git a/Makefile b/Makefile
index 4d5b40e..9b670fd 100644
--- a/Makefile
+++ b/Makefile
@@ -67,12 +67,23 @@ include $(TOP)/mk/boilerplate.mk
 
 # We can't 'make boot' in libraries until stage1 is built
 ifeq "$(BootingFromHc)" "YES"
-SUBDIRS_BUILD = gmp libffi includes rts compat compiler docs utils driver
+SUBDIRS_BUILD = includes rts compiler docs utils driver
 else
-SUBDIRS_BUILD = gmp libffi includes compat utils driver docs compiler rts libraries/Cabal/doc
+SUBDIRS_BUILD = includes utils driver docs compiler rts libraries/Cabal/doc
 endif
 
-SUBDIRS = gmp libffi includes compat utils driver docs rts libraries compiler libraries/Cabal/doc
+SUBDIRS = gmp libffi includes utils driver docs rts libraries compiler libraries/Cabal/doc
+
+check-all: check-tools check-packages
+
+check-tools:
+	@:
+ifeq "$(HADDOCK_DOCS)" "YES"
+ifeq "$(HADDOCK)"      ""
+	echo "Couldn't find haddock" >&2
+	exit 1
+endif
+endif
 
 # Sanity check that all the boot libraries are in the tree, to catch
 # failure to run darcs-all.
@@ -97,8 +108,10 @@ GCC_LIB_DEP = stamp.inplace-gcc-lib
 endif
 endif
 
-stage1 : $(GCC_LIB_DEP) check-packages
+stage1 : $(GCC_LIB_DEP) check-all
 	$(MAKE) -C libraries boot
+	$(MAKE) -C gmp       all
+	$(MAKE) -C libffi    all
 	$(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 \
@@ -126,12 +139,12 @@ stage1 : $(GCC_LIB_DEP) check-packages
 # an example.  Thus, we explicitly build a second version with the stage 1 
 # compiler of all utils that get installed and of all extra support binaries
 # includes in binary dists.
-stage2 : check-packages
+stage2 : check-all
 	$(MAKE) -C compiler boot stage=2
 	$(MAKE) -C compiler stage=2
 
 
-stage3 : check-packages
+stage3 : check-all
 	$(MAKE) -C compiler boot stage=3
 	$(MAKE) -C compiler stage=3
 
@@ -310,7 +323,6 @@ binary-dist-pre::
 	echo 'include $$(TOP)/mk/package.mk' >  $(BIN_DIST_DIR)/mk/target.mk
 	echo 'include $$(TOP)/mk/install.mk' >> $(BIN_DIST_DIR)/mk/target.mk
 	echo 'include $$(TOP)/mk/recurse.mk' >> $(BIN_DIST_DIR)/mk/target.mk
-	echo ''                              >  $(BIN_DIST_DIR)/mk/compat.mk
 	cp mk/package.mk $(BIN_DIST_DIR)/mk/
 	cp mk/install.mk $(BIN_DIST_DIR)/mk/
 	cp mk/recurse.mk $(BIN_DIST_DIR)/mk/
@@ -531,7 +543,6 @@ hc-file-bundle :
 	$(LN_S) . ghc-$(ProjectVersion)
 	$(FIND) ghc-$(ProjectVersion)/compiler \
 	     ghc-$(ProjectVersion)/utils \
-	     ghc-$(ProjectVersion)/compat \
 	     ghc-$(ProjectVersion)/libraries -follow \
 	  \( -name "*.hc" -o -name "*_hsc.[ch]" -o -name "*_stub.[ch]" \) -print > hc-files-to-go
 	for f in `$(FIND) ghc-$(ProjectVersion)/compiler ghc-$(ProjectVersion)/utils ghc-$(ProjectVersion)/libraries -name "*.hsc" -follow -print` ""; do \