From 48f63fe6ade6f28d7bb5df5dc04580ce2c89c99d Mon Sep 17 00:00:00 2001 From: Ian Lynagh Date: Sun, 17 May 2009 00:11:46 +0000 Subject: [PATCH] Bootstrapping fixes --- ghc.mk | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/ghc.mk b/ghc.mk index fb6ba93..b12583a 100644 --- a/ghc.mk +++ b/ghc.mk @@ -329,6 +329,7 @@ endif PACKAGES += haskeline +ifneq "$(BootingFromHc)" "YES" PACKAGES_STAGE2 += \ dph/dph-base \ dph/dph-prim-interface \ @@ -336,6 +337,7 @@ PACKAGES_STAGE2 += \ dph/dph-prim-par \ dph/dph-seq \ dph/dph-par +endif BOOT_PKGS = Cabal hpc extensible-exceptions @@ -497,9 +499,12 @@ BUILD_DIRS += \ ifneq "$(CLEANING)" "YES" BUILD_DIRS += \ - $(patsubst %, libraries/%, $(PACKAGES) $(PACKAGES_STAGE2)) \ + $(patsubst %, libraries/%, $(PACKAGES) $(PACKAGES_STAGE2)) +ifneq "$(BootingFromHc)" "YES" +BUILD_DIRS += \ libraries/dph endif +endif BUILD_DIRS += \ compiler \ -- 1.7.10.4