Fix configure

[ghc-hetmet.git] / ghc.mk

diff --git a/ghc.mk b/ghc.mk
index b12583a..bd2bf7c 100644 (file)
--- 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
 
@@ -469,11 +468,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)
@@ -929,7 +932,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