Skip to content

Commit f796a44

Browse files
UdjinM6PastaPastaPasta
authored andcommitted
build: let additional configure params to be passed into guix (dashpay#5705)
## Issue being fixed or feature implemented Make it possible to pass additional configure params into Guix. This could be used to setup various sets of nightly/debug builds which could then be deployed automagically to catch potential issues early. ## What was done? ## How Has This Been Tested? `CONFIGFLAGS="--enable-debug" HOSTS="x86_64-linux-gnu" ./contrib/guix/guix-build` ## Breaking Changes n/a ## Checklist: - [x] I have performed a self-review of my own code - [ ] I have commented my code, particularly in hard-to-understand areas - [ ] I have added or updated relevant unit/integration/functional/e2e tests - [ ] I have made corresponding changes to the documentation - [x] I have assigned this pull request to a milestone _(for repository code-owners and collaborators only)_
1 parent df79078 commit f796a44

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

contrib/guix/guix-build

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -447,6 +447,7 @@ EOF
447447
${SUBSTITUTE_URLS:+--substitute-urls="$SUBSTITUTE_URLS"} \
448448
${ADDITIONAL_GUIX_COMMON_FLAGS} ${ADDITIONAL_GUIX_ENVIRONMENT_FLAGS} \
449449
-- env HOST="$host" \
450+
CONFIGFLAGS="$CONFIGFLAGS" \
450451
DISTNAME="$DISTNAME" \
451452
JOBS="$JOBS" \
452453
SOURCE_DATE_EPOCH="${SOURCE_DATE_EPOCH:?unable to determine value}" \

contrib/guix/libexec/build.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ Required environment variables as seen inside the container:
2727
DIST_ARCHIVE_BASE: ${DIST_ARCHIVE_BASE:?not set}
2828
DISTNAME: ${DISTNAME:?not set}
2929
HOST: ${HOST:?not set}
30+
CONFIGFLAGS: ${CONFIGFLAGS:?not set}
3031
SOURCE_DATE_EPOCH: ${SOURCE_DATE_EPOCH:?not set}
3132
JOBS: ${JOBS:?not set}
3233
DISTSRC: ${DISTSRC:?not set}
@@ -229,7 +230,7 @@ mkdir -p "$OUTDIR"
229230
###########################
230231

231232
# CONFIGFLAGS
232-
CONFIGFLAGS="--enable-reduce-exports --disable-bench --disable-gui-tests --disable-fuzz-binary"
233+
CONFIGFLAGS+=" --enable-reduce-exports --disable-bench --disable-gui-tests --disable-fuzz-binary"
233234
case "$HOST" in
234235
*linux*) CONFIGFLAGS+=" --disable-threadlocal" ;;
235236
esac

0 commit comments

Comments
 (0)