summaryrefslogtreecommitdiff
path: root/.gitlab
diff options
context:
space:
mode:
authorMatthew Pickering <matthewtpickering@gmail.com>2022-03-02 16:09:23 +0000
committerMarge Bot <ben+marge-bot@smart-cactus.org>2022-03-07 14:06:16 -0500
commit7bfae2ee0e9548f489c52c0e3f4688a9ae83b12b (patch)
tree24093a707c531e654edc36a448fb261b1296fa8b /.gitlab
parent89c14a6ca76d244fe975bc4d9d7378d25b805d74 (diff)
downloadhaskell-7bfae2ee0e9548f489c52c0e3f4688a9ae83b12b.tar.gz
Replace use of BIN_DIST_PREP_TAR_COMP with BIN_DIST_NAME
And adds a check to make sure we are not accidently settings BIN_DIST_PREP_TAR_COMP when using hadrian.
Diffstat (limited to '.gitlab')
-rwxr-xr-x.gitlab/ci.sh3
1 files changed, 3 insertions, 0 deletions
diff --git a/.gitlab/ci.sh b/.gitlab/ci.sh
index 349a6b722b..7cd667fe0d 100755
--- a/.gitlab/ci.sh
+++ b/.gitlab/ci.sh
@@ -485,6 +485,9 @@ function build_hadrian() {
if [ -z "${BIN_DIST_NAME:-}" ]; then
fail "BIN_DIST_NAME not set"
fi
+ if [ -n "${BIN_DIST_PREP_TAR_COMP:-}" ]; then
+ fail "BIN_DIST_PREP_TAR_COMP must not be set for hadrian (you mean BIN_DIST_NAME)"
+ fi
# N.B. First build Hadrian, unsetting MACOSX_DEPLOYMENT_TARGET which may warn
# if the bootstrap libraries were built with a different version expectation.