X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc.mk;h=fadaccdcf54955f762b3b05cb6421fd05fdbd6c9;hb=c9020b2b6b0bee7ebe6f7bb0ba1b93680b0922c5;hp=5a1864e7d169d537b16aac4181add4efac468d4d;hpb=8ca5375714268a61d2549b02204bb44745cb4cbf;p=ghc-hetmet.git

diff --git a/ghc.mk b/ghc.mk
index 5a1864e..fadaccd 100644
--- a/ghc.mk
+++ b/ghc.mk
@@ -345,6 +345,10 @@ $(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 \
 	dph/dph-prim-interface \
@@ -353,6 +357,7 @@ PACKAGES_STAGE2 += \
 	dph/dph-seq \
 	dph/dph-par
 endif
+endif
 
 # We assume that the stage0 compiler has a suitable bytestring package,
 # so we don't have to include it below.
@@ -520,6 +525,7 @@ BUILD_DIRS += \
    driver \
    driver/ghci \
    driver/ghc \
+   driver/haddock \
    libffi \
    includes \
    rts