diff options
| author | Moritz Angermann <moritz.angermann@gmail.com> | 2021-02-18 16:17:28 +0800 |
|---|---|---|
| committer | Moritz Angermann <moritz.angermann@gmail.com> | 2021-02-18 16:17:28 +0800 |
| commit | 16c13d5acfdc8053f7de9e908cc9d845e9bd34bb (patch) | |
| tree | d67f66985672811037d02d16308e03516f71b22f | |
| parent | 70d713caf6bfa0a2b23533f8cc2c4d6f1a11955a (diff) | |
| download | haskell-wip/angerman/ci-make-args-default.tar.gz | |
[ci] Default value for MAKE_ARGSwip/angerman/ci-make-args-default
We don't pass MAKE_ARGS for windows builds, so this should unbreak
them.
| -rwxr-xr-x | .gitlab/ci.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/.gitlab/ci.sh b/.gitlab/ci.sh index d8c8b2b607..ae565fe2ff 100755 --- a/.gitlab/ci.sh +++ b/.gitlab/ci.sh @@ -354,9 +354,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 |