summaryrefslogtreecommitdiff
path: root/.gitlab
diff options
context:
space:
mode:
authorMatthew Pickering <matthewtpickering@gmail.com>2022-01-17 17:45:48 +0000
committerMarge Bot <ben+marge-bot@smart-cactus.org>2022-01-27 02:39:35 -0500
commit6e09b3cfdae6f034ee3a6dd52b61853c017b96f1 (patch)
treea0109f8d5707c31c50ea39ac22afca3213f39715 /.gitlab
parent3577defb3c298578339977c6b8865dff144b7ffa (diff)
downloadhaskell-6e09b3cfdae6f034ee3a6dd52b61853c017b96f1.tar.gz
ci: Add ENABLE_NUMA flag to explicitly turn on libnuma dependency
In recent releases a libnuma dependency has snuck into our bindists because the images have started to contain libnuma. We now explicitly pass `--disable-numa` to configure unless explicitly told not to by using the `ENABLE_NUMA` environment variable. So this is tested, there is one random validate job which builds with --enable-numa so that the code in the RTS is still built. Fixes #20957 and #15444
Diffstat (limited to '.gitlab')
-rwxr-xr-x.gitlab/ci.sh6
1 files changed, 6 insertions, 0 deletions
diff --git a/.gitlab/ci.sh b/.gitlab/ci.sh
index 9449fa27f9..f727da77be 100755
--- a/.gitlab/ci.sh
+++ b/.gitlab/ci.sh
@@ -70,6 +70,7 @@ Environment variables affecting both build systems:
"decreases", or "all")
HERMETIC Take measures to avoid looking at anything in \$HOME
CONFIGURE_ARGS Arguments passed to configure script.
+ ENABLE_NUMA Whether to enable numa support for the build (disabled by default)
INSTALL_CONFIGURE_ARGS
Arguments passed to the binary distribution configure script
during installation of test toolchain.
@@ -404,6 +405,11 @@ function configure() {
if [[ -n "${target_triple:-}" ]]; then
args+=("--target=$target_triple")
fi
+ if [[ -n "${ENABLE_NUMA:-}" ]]; then
+ args+=("--enable-numa")
+ else
+ args+=("--disable-numa")
+ fi
start_section "configuring"
# See https://stackoverflow.com/questions/7577052 for a rationale for the