Commit 94949948 authored by simonpj@microsoft.com's avatar simonpj@microsoft.com

Fix the DPH/profiled make thing (again)

parent 89c56230
...@@ -349,20 +349,28 @@ $(eval $(call addPackage,haskeline)) ...@@ -349,20 +349,28 @@ $(eval $(call addPackage,haskeline))
$(foreach pkg,$(EXTRA_PACKAGES),$(eval $(call addPackage,$(pkg)))) $(foreach pkg,$(EXTRA_PACKAGES),$(eval $(call addPackage,$(pkg))))
ifneq "$(BootingFromHc)" "YES"
ifneq "$(GhcProfiled)" "YES" # ------------------- Adding DPH packaes ---------------
# DPH uses Template Haskell, and Template Haskell doesn't work DPH_PACKAGES = dph/dph-base \
# with a profiled compiler. So if stage-2 is profile, don't build DPH
PACKAGES_STAGE2 += \
dph/dph-base \
dph/dph-prim-interface \ dph/dph-prim-interface \
dph/dph-prim-seq \ dph/dph-prim-seq \
dph/dph-prim-par \ dph/dph-prim-par \
dph/dph-seq \ dph/dph-seq \
dph/dph-par dph/dph-par
endif ifneq "$(BootingFromHc)" "YES"
endif 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, # We assume that the stage0 compiler has a suitable bytestring package,
# so we don't have to include it below. # so we don't have to include it below.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment