From ba148add2194390ade9c719bd3d66f76791256c2 Mon Sep 17 00:00:00 2001 From: UdjinM6 Date: Wed, 15 Nov 2023 20:50:35 +0300 Subject: [PATCH] build: let additional configure params to be passed into guix --- contrib/guix/guix-build | 1 + contrib/guix/libexec/build.sh | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/contrib/guix/guix-build b/contrib/guix/guix-build index a5131d72f7e2a1..176eab32f93dfb 100755 --- a/contrib/guix/guix-build +++ b/contrib/guix/guix-build @@ -447,6 +447,7 @@ EOF ${SUBSTITUTE_URLS:+--substitute-urls="$SUBSTITUTE_URLS"} \ ${ADDITIONAL_GUIX_COMMON_FLAGS} ${ADDITIONAL_GUIX_ENVIRONMENT_FLAGS} \ -- env HOST="$host" \ + CONFIGFLAGS="$CONFIGFLAGS" \ DISTNAME="$DISTNAME" \ JOBS="$JOBS" \ SOURCE_DATE_EPOCH="${SOURCE_DATE_EPOCH:?unable to determine value}" \ diff --git a/contrib/guix/libexec/build.sh b/contrib/guix/libexec/build.sh index 060cf79cf8bea2..9219decae175ef 100644 --- a/contrib/guix/libexec/build.sh +++ b/contrib/guix/libexec/build.sh @@ -229,7 +229,7 @@ mkdir -p "$OUTDIR" ########################### # CONFIGFLAGS -CONFIGFLAGS="--enable-reduce-exports --disable-bench --disable-gui-tests --disable-fuzz-binary" +CONFIGFLAGS+=" --enable-reduce-exports --disable-bench --disable-gui-tests --disable-fuzz-binary" case "$HOST" in *linux*) CONFIGFLAGS+=" --disable-threadlocal" ;; esac