summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMoritz Angermann <moritz.angermann@gmail.com>2021-02-18 16:17:28 +0800
committerMoritz Angermann <moritz.angermann@gmail.com>2021-05-07 09:17:22 +0800
commit5f5b02c25130979ac7c9530e3c7d89e49beb5a24 (patch)
tree6a7c77277ef0d381be897d617c2c084e1ff33d45
parentbb78df780b53ce8d37e615e5b1cea0402abfd6a9 (diff)
downloadhaskell-5f5b02c25130979ac7c9530e3c7d89e49beb5a24.tar.gz
[ci] Default value for MAKE_ARGS
We don't pass MAKE_ARGS for windows builds, so this should unbreak them. (cherry picked from commit 16c13d5acfdc8053f7de9e908cc9d845e9bd34bb)
-rwxr-xr-x.gitlab/ci.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/.gitlab/ci.sh b/.gitlab/ci.sh
index 471adddaf4..54a97222c3 100755
--- a/.gitlab/ci.sh
+++ b/.gitlab/ci.sh
@@ -408,9 +408,9 @@ function build_make() {
fail "BIN_DIST_PREP_TAR_COMP is not set"
fi
if [[ -n "${VERBOSE:-}" ]]; then
- MAKE_ARGS="$MAKE_ARGS V=1"
+ MAKE_ARGS="${MAKE_ARGS:-} V=1"
else
- MAKE_ARGS="$MAKE_ARGS V=0"
+ MAKE_ARGS="${MAKE_ARGS:-} V=0"
fi
echo "include mk/flavours/${BUILD_FLAVOUR}.mk" > mk/build.mk