From 949499484225617839916e6aba414f9f3b38aab1 Mon Sep 17 00:00:00 2001
From: "simonpj@microsoft.com" <unknown>
Date: Wed, 25 Aug 2010 09:16:02 +0000
Subject: [PATCH] Fix the DPH/profiled make thing (again)

---
 ghc.mk |   24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/ghc.mk b/ghc.mk
index 9a52105..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 "$(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 ---------------
+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.
-- 
1.7.10.4