X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc.mk;h=61e17eea11d847dc003a691fa2756e118c5376ec;hb=5cc715b218c2da096055a38a453054cbe0b676c0;hp=fb6ba938685887ab95f86e66679f6d556d84c71c;hpb=81e5f8ff44ed5c734c9966ba0f3faf2d84c74577;p=ghc-hetmet.git

diff --git a/ghc.mk b/ghc.mk
index fb6ba93..61e17ee 100644
--- a/ghc.mk
+++ b/ghc.mk
@@ -51,7 +51,6 @@
 #
 # Tickets we can now close, or fix and close:
 #
-#   * 2966 make sure --with-gcc does the right thing (#2966)
 #   * 1693 make distclean
 #   * 3173 make install with DESTDIR
 
@@ -101,6 +100,8 @@
 #           o libraries/*
 #           o compiler
 
+.PHONY: default all haddock
+
 default : all
 
 # Just bring makefiles up to date:
@@ -329,6 +330,7 @@ endif
 
 PACKAGES += haskeline
 
+ifneq "$(BootingFromHc)" "YES"
 PACKAGES_STAGE2 += \
 	dph/dph-base \
 	dph/dph-prim-interface \
@@ -336,6 +338,7 @@ PACKAGES_STAGE2 += \
 	dph/dph-prim-par \
 	dph/dph-seq \
 	dph/dph-par
+endif
 
 BOOT_PKGS = Cabal hpc extensible-exceptions
 
@@ -467,11 +470,15 @@ BUILD_DIRS += \
    gmp \
    docs/users_guide \
    libraries/Cabal/doc \
-   $(GHC_MANGLER_DIR) \
-   $(GHC_SPLIT_DIR) \
    $(GHC_UNLIT_DIR) \
    $(GHC_HP2PS_DIR)
 
+ifneq "$(GhcUnregisterised)" "YES"
+BUILD_DIRS += \
+   $(GHC_MANGLER_DIR) \
+   $(GHC_SPLIT_DIR)
+endif
+
 ifneq "$(BINDIST)" "YES"
 BUILD_DIRS += \
    $(GHC_GENPRIMOP_DIR)
@@ -497,9 +504,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 \
@@ -882,6 +892,7 @@ CLEAN_FILES += utils/ghc-pwd/ghc-pwd
 CLEAN_FILES += utils/ghc-pwd/ghc-pwd.exe
 CLEAN_FILES += utils/ghc-pwd/ghc-pwd.hi
 CLEAN_FILES += utils/ghc-pwd/ghc-pwd.o
+CLEAN_FILES += libraries/bootstrapping.conf
 
 clean : clean_files
 .PHONY: clean_files
@@ -924,7 +935,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