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-04-20 15:51:25 +0800
commitdc47e0a0c533afd21d51d9aa126ef2b27ae7ea9e (patch)
treef4195cb4a4fb15df1ad8f209c283e818a10fd6f9
parent15372ddf95a1997152580a52476a258e01339e20 (diff)
downloadhaskell-dc47e0a0c533afd21d51d9aa126ef2b27ae7ea9e.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 4eab89790e..cc0369c1a6 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