Update `make` based build system

* replace integer-* package selection with ghc-bignum backend selection

8 files changed, 10 insertions, 10 deletions

diff --git a/mk/build.mk.sample b/mk/build.mk.sample
index 80457b6a47..e3417a2765 100644
--- a/mk/build.mk.sample
+++ b/mk/build.mk.sample
@@ -99,9 +99,9 @@ endif
 # https://gitlab.haskell.org/ghc/ghc/wikis/building/running-tests/running#additional-packages
 #BUILD_EXTRA_PKGS=YES
 
-# Uncomment the following to force `integer-gmp` to use the in-tree GMP 6.1.2
+# Uncomment the following to force `ghc-bignum` to use the in-tree GMP 6.1.2
 # (other sometimes useful configure-options: `--with-gmp-{includes,libraries}`)
-#libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-intree-gmp
+#libraries/ghc-bignum_CONFIGURE_OPTS += --configure-option=--with-intree-gmp
 
 # Enable pretty hyperlinked sources
 #HADDOCK_DOCS = YES
diff --git a/mk/config.mk.in b/mk/config.mk.in
index ef2ee685ab..406e72ba1b 100644
--- a/mk/config.mk.in
+++ b/mk/config.mk.in
@@ -244,8 +244,8 @@ ExtraMakefileSanityChecks = NO
 #------------------------------------------------------------------------------
 # Options for Libraries
 
-# Which directory (in libraries/) contains the integer library?
-INTEGER_LIBRARY=integer-gmp
+# Backend to use in ghc-bignum (gmp, native, etc.)
+BIGNUM_BACKEND=gmp
 
 # We build the libraries at least the "vanilla" way (way "v")
 # Technically we don't need the v way if DYNAMIC_GHC_PROGRAMS is YES,
diff --git a/mk/flavours/bench-cross-ncg.mk b/mk/flavours/bench-cross-ncg.mk
index 1fc7b245a0..727f9301ae 100644
--- a/mk/flavours/bench-cross-ncg.mk
+++ b/mk/flavours/bench-cross-ncg.mk
@@ -10,7 +10,7 @@ BUILD_SPHINX_PDF   = NO
 BUILD_MAN          = NO
 WITH_TERMINFO      = NO
 
-INTEGER_LIBRARY      = integer-simple
+BIGNUM_BACKEND       = native
 Stage1Only           = YES
 DYNAMIC_BY_DEFAULT   = NO
 DYNAMIC_GHC_PROGRAMS = NO
diff --git a/mk/flavours/bench-cross.mk b/mk/flavours/bench-cross.mk
index 7d1d4c4260..fa332fe9f6 100644
--- a/mk/flavours/bench-cross.mk
+++ b/mk/flavours/bench-cross.mk
@@ -10,7 +10,7 @@ BUILD_SPHINX_PDF   = NO
 BUILD_MAN          = NO
 WITH_TERMINFO      = NO
 
-INTEGER_LIBRARY      = integer-simple
+BIGNUM_BACKEND       = native
 Stage1Only           = YES
 DYNAMIC_BY_DEFAULT   = NO
 DYNAMIC_GHC_PROGRAMS = NO
diff --git a/mk/flavours/perf-cross-ncg.mk b/mk/flavours/perf-cross-ncg.mk
index 56ecc79b13..fefff049d3 100644
--- a/mk/flavours/perf-cross-ncg.mk
+++ b/mk/flavours/perf-cross-ncg.mk
@@ -9,7 +9,7 @@ BUILD_SPHINX_PDF   = NO
 BUILD_MAN          = NO
 WITH_TERMINFO      = NO
 
-INTEGER_LIBRARY      = integer-simple
+BIGNUM_BACKEND       = native
 Stage1Only           = YES
 DYNAMIC_BY_DEFAULT   = NO
 DYNAMIC_GHC_PROGRAMS = NO
diff --git a/mk/flavours/perf-cross.mk b/mk/flavours/perf-cross.mk
index 9e48ce9605..36d33b68b5 100644
--- a/mk/flavours/perf-cross.mk
+++ b/mk/flavours/perf-cross.mk
@@ -9,7 +9,7 @@ BUILD_SPHINX_PDF   = NO
 BUILD_MAN          = NO
 WITH_TERMINFO      = NO
 
-INTEGER_LIBRARY      = integer-simple
+BIGNUM_BACKEND       = native
 Stage1Only           = YES
 DYNAMIC_BY_DEFAULT   = NO
 DYNAMIC_GHC_PROGRAMS = NO
diff --git a/mk/flavours/quick-cross-ncg.mk b/mk/flavours/quick-cross-ncg.mk
index 471b37dc6b..55e62f6b0f 100644
--- a/mk/flavours/quick-cross-ncg.mk
+++ b/mk/flavours/quick-cross-ncg.mk
@@ -10,7 +10,7 @@ BUILD_SPHINX_PDF   = NO
 BUILD_MAN          = NO
 WITH_TERMINFO      = NO
 
-INTEGER_LIBRARY      = integer-simple
+BIGNUM_BACKEND       = native
 Stage1Only           = YES
 DYNAMIC_BY_DEFAULT   = NO
 DYNAMIC_GHC_PROGRAMS = NO
diff --git a/mk/flavours/quick-cross.mk b/mk/flavours/quick-cross.mk
index 98defa700c..07ed5f06ff 100644
--- a/mk/flavours/quick-cross.mk
+++ b/mk/flavours/quick-cross.mk
@@ -10,7 +10,7 @@ BUILD_SPHINX_PDF   = NO
 BUILD_MAN          = NO
 WITH_TERMINFO      = NO
 
-INTEGER_LIBRARY      = integer-simple
+BIGNUM_BACKEND       = native
 Stage1Only           = YES
 DYNAMIC_BY_DEFAULT   = NO
 DYNAMIC_GHC_PROGRAMS = NO