diff options
| author | simonpj@microsoft.com <unknown> | 2010-08-25 09:16:02 +0000 |
|---|---|---|
| committer | simonpj@microsoft.com <unknown> | 2010-08-25 09:16:02 +0000 |
| commit | 949499484225617839916e6aba414f9f3b38aab1 (patch) | |
| tree | 7f1762029bd7f1674d06b56af8b775855530f338 /ghc.mk | |
| parent | 89c562301fb110184fb9f604c5ad2fd6a10b7fe9 (diff) | |
| download | haskell-949499484225617839916e6aba414f9f3b38aab1.tar.gz | |
Fix the DPH/profiled make thing (again)
Diffstat (limited to 'ghc.mk')
| -rw-r--r-- | ghc.mk | 24 |
1 files changed, 16 insertions, 8 deletions
@@ -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. |