diff options
| author | Sylvain Henry <sylvain@haskus.fr> | 2020-02-11 09:56:43 +0100 |
|---|---|---|
| committer | Ben Gamari <ben@smart-cactus.org> | 2020-06-17 16:22:03 -0400 |
| commit | aa9e7b7196f03f84579e3b4a09068c668cbe6ffb (patch) | |
| tree | c4bf6673ea4298a4675b21c8b5dcbc205bfbb86f /rules | |
| parent | 0f67e3447e5a0089b5348940d404ed876fddddfc (diff) | |
| download | haskell-aa9e7b7196f03f84579e3b4a09068c668cbe6ffb.tar.gz | |
Update `make` based build system
* replace integer-* package selection with ghc-bignum backend selection
Diffstat (limited to 'rules')
| -rw-r--r-- | rules/build-package-data.mk | 5 | ||||
| -rw-r--r-- | rules/foreachLibrary.mk | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/rules/build-package-data.mk b/rules/build-package-data.mk index 1c5987e63d..e2a98082d2 100644 --- a/rules/build-package-data.mk +++ b/rules/build-package-data.mk @@ -100,6 +100,11 @@ ifeq "$$(GMP_FORCE_INTREE)" "YES" $1_$2_CONFIGURE_OPTS += --configure-option=--with-intree-gmp endif +ifeq "$$(GMP_ENABLED)" "YES" +$1_$2_CONFIGURE_OPTS += --configure-option=--with-gmp +endif + + ifneq "$$(CURSES_LIB_DIRS)" "" $1_$2_CONFIGURE_OPTS += --configure-option=--with-curses-libraries="$$(CURSES_LIB_DIRS)" endif diff --git a/rules/foreachLibrary.mk b/rules/foreachLibrary.mk index dddd61a899..60dd0d3a82 100644 --- a/rules/foreachLibrary.mk +++ b/rules/foreachLibrary.mk @@ -32,7 +32,7 @@ # - ghc-boot-th # - ghc-prim # - integer-gmp -# - integer-simple +# - ghc-bignum # - template-haskell define foreachLibrary @@ -44,7 +44,7 @@ $$(foreach hashline,libraries/ghc-boot-th#-#no-remote-repo#no-vcs \ libraries/base#-#no-remote-repo#no-vcs \ libraries/ghc-prim#-#no-remote-repo#no-vcs \ libraries/integer-gmp#-#no-remote-repo#no-vcs \ - libraries/integer-simple#-#no-remote-repo#no-vcs \ + libraries/ghc-bignum#-#no-remote-repo#no-vcs \ libraries/template-haskell#-#no-remote-repo#no-vcs \ $$(shell grep '^libraries/' packages | sed 's/ */#/g'),\ $$(eval FEL_line := $$(subst #,$$(space),$$(hashline))) \ |