X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc.mk;h=3214c656e24d1c12f2237335ec96e16ce842f9f1;hb=9eba9078e1993db58b8e12e9287f448df64a4fb6;hp=89de086af2878269f82aa04c7f85f7fc3f76a7e4;hpb=3d80517affefabf7aac92262a7d9eb6077a7ada6;p=ghc-hetmet.git

diff --git a/ghc.mk b/ghc.mk
index 89de086..3214c65 100644
--- a/ghc.mk
+++ b/ghc.mk
@@ -349,20 +349,28 @@ $(eval $(call addPackage,haskeline))
 
 $(foreach pkg,$(EXTRA_PACKAGES),$(eval $(call addPackage,$(pkg))))
 
-ifneq "$(BootingFromHc)" "YES"
 
-ifneq "$(CLEANING) $(GhcProfiled)" "NO YES"
-# DPH uses Template Haskell, and Template Haskell doesn't work
-# with a profiled compiler. So if stage-2 is profile, don't build DPH
-PACKAGES_STAGE2 += \
-	dph/dph-base \
+# -------------------  Adding DPH packaes ---------------
+DPH_PACKAGES = 	dph/dph-base \
 	dph/dph-prim-interface \
 	dph/dph-prim-seq \
 	dph/dph-prim-par \
 	dph/dph-seq \
 	dph/dph-par
-endif
-endif
+ifneq "$(BootingFromHc)" "YES"
+ifeq "$(CLEANING)" "YES"
+# If we are cleaning we must add DPH packages regardless,
+# for reasons we now forget
+PACKAGES_STAGE2 += $(DPH_PACKAGES)
+else # not CLEANING
+ifneq "$(GhcProfiled)" "YES"
+# DPH uses Template Haskell, and Template Haskell doesn't work
+# with a profiled compiler. So if stage-2 is profile, don't build DPH
+PACKAGES_STAGE2 += $(DPH_PACKAGES)
+endif  # GhcProfiled
+endif  # Cleaning
+endif  # BootingFromHc
+# ------------------------------------------------------- 
 
 # We assume that the stage0 compiler has a suitable bytestring package,
 # so we don't have to include it below.
@@ -574,6 +582,11 @@ BUILD_DIRS += \
    $(GHC_TOUCHY_DIR)
 endif
 
+ifneq "$(BINDIST)" "YES"
+BUILD_DIRS += \
+   utils/mkUserGuidePart
+endif
+
 BUILD_DIRS += utils/count_lines
 BUILD_DIRS += utils/compare_sizes
 
@@ -608,6 +621,7 @@ utils/ghctags_dist_DISABLE = YES
 utils/hpc_dist_DISABLE = YES
 utils/hsc2hs_dist-install_DISABLE = YES
 utils/ghc-pkg_dist-install_DISABLE = YES
+utils/mkUserGuidePart_dist_DISABLE = YES
 utils/compare_sizes_dist_DISABLE = YES
 compiler_stage2_DISABLE = YES
 compiler_stage3_DISABLE = YES