Commit 48f63fe6 authored by Ian Lynagh's avatar Ian Lynagh

Bootstrapping fixes

parent 81e5f8ff
...@@ -329,6 +329,7 @@ endif ...@@ -329,6 +329,7 @@ endif
PACKAGES += haskeline PACKAGES += haskeline
ifneq "$(BootingFromHc)" "YES"
PACKAGES_STAGE2 += \ PACKAGES_STAGE2 += \
dph/dph-base \ dph/dph-base \
dph/dph-prim-interface \ dph/dph-prim-interface \
...@@ -336,6 +337,7 @@ PACKAGES_STAGE2 += \ ...@@ -336,6 +337,7 @@ PACKAGES_STAGE2 += \
dph/dph-prim-par \ dph/dph-prim-par \
dph/dph-seq \ dph/dph-seq \
dph/dph-par dph/dph-par
endif
BOOT_PKGS = Cabal hpc extensible-exceptions BOOT_PKGS = Cabal hpc extensible-exceptions
...@@ -497,9 +499,12 @@ BUILD_DIRS += \ ...@@ -497,9 +499,12 @@ BUILD_DIRS += \
ifneq "$(CLEANING)" "YES" ifneq "$(CLEANING)" "YES"
BUILD_DIRS += \ BUILD_DIRS += \
$(patsubst %, libraries/%, $(PACKAGES) $(PACKAGES_STAGE2)) \ $(patsubst %, libraries/%, $(PACKAGES) $(PACKAGES_STAGE2))
ifneq "$(BootingFromHc)" "YES"
BUILD_DIRS += \
libraries/dph libraries/dph
endif endif
endif
BUILD_DIRS += \ BUILD_DIRS += \
compiler \ compiler \
......
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