X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc.mk;h=2bea8290e8de29308275a78d206e2c3ef0a9fbd8;hb=8a3ed3364fbc74b1f1b87b049737da2b251f92df;hp=fb6ba938685887ab95f86e66679f6d556d84c71c;hpb=81e5f8ff44ed5c734c9966ba0f3faf2d84c74577;p=ghc-hetmet.git diff --git a/ghc.mk b/ghc.mk index fb6ba93..2bea829 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 \ @@ -924,7 +929,7 @@ maintainer-clean : distclean .PHONY: all_libraries .PHONY: bootstrapping-files -bootstrapping-files: $(GMP_LIB) +bootstrapping-files: $(OTHER_LIBS) bootstrapping-files: includes/ghcautoconf.h bootstrapping-files: includes/DerivedConstants.h bootstrapping-files: includes/GHCConstants.h