From 87f57ecf2523e83d8dd9cad919a6f2010f630ad0 Mon Sep 17 00:00:00 2001
From: Adam Sandberg Ericsson <adam@sandbergericsson.se>
Date: Mon, 3 May 2021 17:29:13 +0100
Subject: ci: fix ci.sh by creating build.mk in one place

Previously `prepare_build_mk` created a build.mk that was overwritten right
after.

This makes the BIGNUM_BACKEND choice take effect, fixing #19953, and
causing the metric increase below in the integer-simple job.

Metric Increase:
    space_leak_001
---
 .gitlab/ci.sh | 22 ++--------------------
 1 file changed, 2 insertions(+), 20 deletions(-)

diff --git a/.gitlab/ci.sh b/.gitlab/ci.sh
index e40c227b08..6f6c3de4cc 100755
--- a/.gitlab/ci.sh
+++ b/.gitlab/ci.sh
@@ -338,20 +338,8 @@ function prepare_build_mk() {
   if [[ -z ${BIGNUM_BACKEND:-} ]]; then BIGNUM_BACKEND=gmp; fi
 
   cat > mk/build.mk <<EOF
-V=1
-HADDOCK_DOCS=YES
-LATEX_DOCS=YES
-HSCOLOUR_SRCS=YES
-BUILD_SPHINX_HTML=$BUILD_SPHINX_HTML
-BUILD_SPHINX_PDF=$BUILD_SPHINX_PDF
-BeConservative=YES
-BIGNUM_BACKEND=$BIGNUM_BACKEND
-XZ_CMD=${XZ:-}
-
-BuildFlavour=$BUILD_FLAVOUR
-ifneq "\$(BuildFlavour)" ""
-include mk/flavours/\$(BuildFlavour).mk
-endif
+BIGNUM_BACKEND=${BIGNUM_BACKEND}
+include mk/flavours/${BUILD_FLAVOUR}.mk
 GhcLibHcOpts+=-haddock
 EOF
 
@@ -359,10 +347,6 @@ EOF
     echo "EXTRA_HADDOCK_OPTS += --hyperlinked-source --quickjump" >> mk/build.mk
   fi
 
-  case "$(uname)" in
-    Darwin) echo "libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-intree-gmp" >> mk/build.mk ;;
-    *) ;;
-  esac
 
   info "build.mk is:"
   cat mk/build.mk
@@ -400,8 +384,6 @@ function build_make() {
     MAKE_ARGS="${MAKE_ARGS:-} V=0"
   fi
 
-  echo "include mk/flavours/${BUILD_FLAVOUR}.mk" > mk/build.mk
-  echo 'GhcLibHcOpts+=-haddock' >> mk/build.mk
   run "$MAKE" -j"$cores" "$MAKE_ARGS"
   run "$MAKE" -j"$cores" binary-dist-prep TAR_COMP_OPTS=-1
   ls -lh "$BIN_DIST_PREP_TAR_COMP"
-- 
cgit v1.2.1