X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc.mk;h=8d95bf82ea5b477a749d364ca72615c7915db3bc;hb=a59f5d6552674928879cae0d225e6052876d5ca4;hp=5040ff5097c0a90efd6de60a2a0fdff37d8105e3;hpb=ff30c8f61ed7318563a4f9185815e80cf35e363d;p=ghc-hetmet.git

diff --git a/ghc.mk b/ghc.mk
index 5040ff5..8d95bf8 100644
--- a/ghc.mk
+++ b/ghc.mk
@@ -648,7 +648,9 @@ utils/touchy_dist_CONFIGURE_PHASE = 1
 # Finally, the stage1 compiler is used to make the dependencies for
 # everything else, so we can now build the rest.
 compiler_stage2_CONFIGURE_PHASE = 3
+compiler_stage3_CONFIGURE_PHASE = 3
 ghc_stage2_CONFIGURE_PHASE = 3
+ghc_stage3_CONFIGURE_PHASE = 3
 
 $(foreach lib,$(PACKAGES) $(PACKAGES_STAGE2),$(eval \
   libraries/$(lib)_dist-install_CONFIGURE_PHASE = 3))
@@ -701,7 +703,7 @@ $(foreach p,$(STAGE0_PACKAGES),$(eval libraries/$p_dist-boot_DO_HADDOCK = NO))
 
 # Build the Haddock contents and index
 ifeq "$(HADDOCK_DOCS)" "YES"
-libraries/index.html: inplace/bin/haddock $(ALL_HADDOCK_FILES)
+libraries/index.html: inplace/bin/haddock$(exeext) $(ALL_HADDOCK_FILES)
 	cd libraries && sh gen_contents_index --inplace
 ifeq "$(phase)" ""
 $(eval $(call all-target,library_doc_index,libraries/index.html))