Add an (Outputable Word16) instance

[ghc-hetmet.git] / ghc.mk

diff --git a/ghc.mk b/ghc.mk
index bc4642e..e3ddd75 100644 (file)
--- a/ghc.mk
+++ b/ghc.mk
@@ -29,9 +29,7 @@
 #     * docs/vh/Makefile
 #     * rts/dotnet/Makefile
 #     * utils/Makefile
-#   * GhcProfiled
 #   * optionally install stage3?
-#   * shared libraries, way dyn
 #   * add Makefiles for the rest of the utils/ programs that aren't built
 #     by default (need to exclude them from 'make all' too)
 #
@@ -297,8 +295,7 @@ define addPackage # args: $1 = package, $2 = condition
 endef
 
 $(eval $(call addPackage,ghc-prim))
-$(eval $(call addPackage,integer-gmp))
-$(eval $(call addPackage,integer))
+$(eval $(call addPackage,$(INTEGER_LIBRARY)))
 $(eval $(call addPackage,base))
 $(eval $(call addPackage,filepath))
 $(eval $(call addPackage,array))
@@ -505,8 +502,11 @@ BUILD_DIRS += \
 endif
 endif
 
+ifeq "$(INTEGER_LIBRARY)" "integer-gmp"
+BUILD_DIRS += libraries/integer-gmp/gmp
+endif
+
 BUILD_DIRS += \
-   libraries/integer-gmp/gmp \
    compiler \
    $(GHC_HSC2HS_DIR) \
    $(GHC_PKG_DIR) \
@@ -535,15 +535,17 @@ ifneq "$(findstring $(phase),0 1 2)" ""
 ghc_stage1_DISABLE = YES
 endif
 
+ifneq "$(CLEANING)" "YES"
 ifeq "$(INTEGER_LIBRARY)" "integer-gmp"
 libraries/base_dist-install_CONFIGURE_OPTS += --flags=-integer-simple
 else
     ifeq "$(INTEGER_LIBRARY)" "integer-simple"
        libraries/base_dist-install_CONFIGURE_OPTS += --flags=integer-simple
     else
-       $(error Unknown integer library: $(INTEGER_LIBRARY))
+$(error Unknown integer library: $(INTEGER_LIBRARY))
     endif
 endif
+endif
 
 ifneq "$(findstring $(phase),0 1 2 3)" ""
 # In phases 0-3, we disable stage2-3, the full libraries and haddock