summaryrefslogtreecommitdiff
path: root/ghc.mk
diff options
context:
space:
mode:
authorIan Lynagh <igloo@earth.li>2009-07-22 15:10:48 +0000
committerIan Lynagh <igloo@earth.li>2009-07-22 15:10:48 +0000
commit30a08433b46de89511fcdf0149f0749739227efb (patch)
tree119a8246c117b2e6ac186c38861aee5f8ec63767 /ghc.mk
parent51984e25deeba8a8abbab00d89cca51f3fd051b0 (diff)
downloadhaskell-30a08433b46de89511fcdf0149f0749739227efb.tar.gz
Make the Integer library used directly configurable in GHC and base
Rather than indirecting through an integer package
Diffstat (limited to 'ghc.mk')
-rw-r--r--ghc.mk8
1 files changed, 5 insertions, 3 deletions
diff --git a/ghc.mk b/ghc.mk
index c1a71ae5a4..b2701bf5cf 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) \