X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc.mk;h=b2701bf5cf59e8d2ed0ba0101711eaa332aa9f7d;hb=30a08433b46de89511fcdf0149f0749739227efb;hp=c1a71ae5a4c8b6ee9943e3b00cb4d1e0586f1848;hpb=51984e25deeba8a8abbab00d89cca51f3fd051b0;p=ghc-hetmet.git

diff --git a/ghc.mk b/ghc.mk
index c1a71ae..b2701bf 100644
--- a/ghc.mk
+++ b/ghc.mk
@@ -297,8 +297,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 +504,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) \