Skip to content
Snippets Groups Projects
Commit 2eb870ae authored by adam's avatar adam Committed by Zubin
Browse files

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

(cherry picked from commit 87f57ecf)
parent f56f575e
No related branches found
No related tags found
No related merge requests found
...@@ -282,19 +282,9 @@ function prepare_build_mk() { ...@@ -282,19 +282,9 @@ function prepare_build_mk() {
if [[ -z ${INTEGER_LIBRARY:-} ]]; then INTEGER_LIBRARY=integer-gmp; fi if [[ -z ${INTEGER_LIBRARY:-} ]]; then INTEGER_LIBRARY=integer-gmp; fi
cat > mk/build.mk <<EOF 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
INTEGER_LIBRARY=$INTEGER_LIBRARY INTEGER_LIBRARY=$INTEGER_LIBRARY
BuildFlavour=$BUILD_FLAVOUR BuildFlavour=$BUILD_FLAVOUR
ifneq "\$(BuildFlavour)" "" include mk/flavours/${BUILD_FLAVOUR}.mk
include mk/flavours/\$(BuildFlavour).mk
endif
GhcLibHcOpts+=-haddock GhcLibHcOpts+=-haddock
EOF EOF
...@@ -302,10 +292,6 @@ EOF ...@@ -302,10 +292,6 @@ EOF
echo "EXTRA_HADDOCK_OPTS += --hyperlinked-source --quickjump" >> mk/build.mk echo "EXTRA_HADDOCK_OPTS += --hyperlinked-source --quickjump" >> mk/build.mk
fi fi
case "$(uname)" in
Darwin) echo "libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-intree-gmp" >> mk/build.mk ;;
*) ;;
esac
info "build.mk is:" info "build.mk is:"
cat mk/build.mk cat mk/build.mk
...@@ -344,9 +330,7 @@ function build_make() { ...@@ -344,9 +330,7 @@ function build_make() {
MAKE_ARGS="${MAKE_ARGS:-} V=0" MAKE_ARGS="${MAKE_ARGS:-} V=0"
fi fi
echo "include mk/flavours/${BUILD_FLAVOUR}.mk" > mk/build.mk run "$MAKE" -j"$cores" "$MAKE_ARGS"
echo 'GhcLibHcOpts+=-haddock' >> mk/build.mk
run "$MAKE" -j"$cores" $MAKE_ARGS
run "$MAKE" -j"$cores" binary-dist-prep TAR_COMP_OPTS=-1 run "$MAKE" -j"$cores" binary-dist-prep TAR_COMP_OPTS=-1
ls -lh "$BIN_DIST_PREP_TAR_COMP" ls -lh "$BIN_DIST_PREP_TAR_COMP"
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment