Skip to content

Commit 17df15e

Browse files
committed
Merge #18958: guix: Make V=1 more powerful for debugging
f852761 guix: Add clarifying documentation for V env var (Carl Dong) 85f4a4b guix: Make V=1 more powerful for debugging (Carl Dong) Pull request description: ``` - Print commands in both unexpanded and expanded forms - Set VERBOSE=1 for CMake ``` Ping MarcoFalke hopefully you use `V=1` already for the Guix builds on DrahtBot? ACKs for top commit: fanquake: ACK f852761. Ran a Windows Guix build and compared the output from master and this PR when using `V=1`. i.e `HOSTS=x86_64-w64-mingw32 PATH="/root/.config/guix/current/bin${PATH:+:}$PATH" V=1 ./contrib/guix/guix-build.sh`. Tree-SHA512: 8bc466fa7b869618bbd5a0a91c6b23d4785009289f8dfb93b0349317463a9ab9ece128c72436e02a0819722a63e703100aed15807867a716fda891292fcb9d9d
2 parents 3eda7ea + f852761 commit 17df15e

File tree

2 files changed

+13
-0
lines changed

2 files changed

+13
-0
lines changed

contrib/guix/README.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -142,6 +142,11 @@ find output/ -type f -print0 | sort -z | xargs -r0 sha256sum
142142
If non-empty, will pass `V=1` to all `make` invocations, making `make` output
143143
verbose.
144144

145+
Note that any given value is ignored. The variable is only checked for
146+
emptiness. More concretely, this means that `V=` (setting `V` to the empty
147+
string) is interpreted the same way as not setting `V` at all, and that `V=0`
148+
has the same effect as `V=1`.
149+
145150
* _**ADDITIONAL_GUIX_ENVIRONMENT_FLAGS**_
146151

147152
Additional flags to be passed to `guix environment`. For a fully-bootstrapped

contrib/guix/libexec/build.sh

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,14 @@ export LC_ALL=C
33
set -e -o pipefail
44
export TZ=UTC
55

6+
if [ -n "$V" ]; then
7+
# Print both unexpanded (-v) and expanded (-x) forms of commands as they are
8+
# read from this file.
9+
set -vx
10+
# Set VERBOSE for CMake-based builds
11+
export VERBOSE="$V"
12+
fi
13+
614
# Check that environment variables assumed to be set by the environment are set
715
echo "Building for platform triple ${HOST:?not set} with reference timestamp ${SOURCE_DATE_EPOCH:?not set}..."
816
echo "At most ${MAX_JOBS:?not set} jobs will run at once..."

0 commit comments

Comments
 (0)