X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc.mk;h=12b0d0c7469a29d534897d1b55375a30c781034e;hb=5ee7f0e66649ef31c2fcb2528399b57eba5651db;hp=2359c82ae160d8399d3772946b9923223ab95ddb;hpb=f1c16ba99441b1012dca4ebde34541c905c5e367;p=ghc-hetmet.git

diff --git a/ghc.mk b/ghc.mk
index 2359c82..12b0d0c 100644
--- a/ghc.mk
+++ b/ghc.mk
@@ -101,6 +101,10 @@ endif
 just-makefiles:
 	@:
 
+ifneq "$(CLEANING)" "YES"
+CLEANING = NO
+endif
+
 # -----------------------------------------------------------------------------
 # Misc GNU make utils
 
@@ -349,20 +353,28 @@ $(eval $(call addPackage,haskeline))
 
 $(foreach pkg,$(EXTRA_PACKAGES),$(eval $(call addPackage,$(pkg))))
 
-ifneq "$(BootingFromHc)" "YES"
 
-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/dph-base \
+# -------------------  Adding DPH packaes ---------------
+
+# The DPH packages are added when:
+#   * not BootingFromHc (they aren't necessary for bootstrapping), and
+#     * not GhcProfiled (they need TH, so can't be compiled by a -prof GHC), or
+#     * CLEANING: when cleaning we always enable everything
+
+# if !BootingFromHc && (!GhcProfiled || CLEANING)
+
+ifneq "$(BootingFromHc)" "YES"
+ifneq "$(GhcProfiled) $(CLEANING)" "NO YES"
+PACKAGES_STAGE2 += dph/dph-base \
 	dph/dph-prim-interface \
 	dph/dph-prim-seq \
 	dph/dph-prim-par \
 	dph/dph-seq \
 	dph/dph-par
 endif
-endif
+endif  # BootingFromHc
+# ------------------------------------------------------- 
+
 
 # We assume that the stage0 compiler has a suitable bytestring package,
 # so we don't have to include it below.
@@ -574,6 +586,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 +625,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