mirror of
https://github.com/bitcoin/bitcoin.git
synced 2025-03-05 14:06:27 -05:00
guix: Move OUTDIR determination+creation to guix-build.sh
This commit is contained in:
parent
d27ff8b86a
commit
0b7cd07bb5
2 changed files with 6 additions and 4 deletions
|
@ -91,6 +91,10 @@ time-machine() {
|
|||
-- "$@"
|
||||
}
|
||||
|
||||
# Make sure an output directory exists for our builds
|
||||
OUTDIR="${OUTDIR:-${PWD}/output}"
|
||||
[ -e "$OUTDIR" ] || mkdir -p "$OUTDIR"
|
||||
|
||||
#########
|
||||
# Build #
|
||||
#########
|
||||
|
@ -189,6 +193,7 @@ for host in ${HOSTS=x86_64-linux-gnu arm-linux-gnueabihf aarch64-linux-gnu riscv
|
|||
--pure \
|
||||
--no-cwd \
|
||||
--share="$PWD"=/bitcoin \
|
||||
--share="$OUTDIR"=/outdir \
|
||||
--expose="$(git rev-parse --git-common-dir)" \
|
||||
${SOURCES_PATH:+--share="$SOURCES_PATH"} \
|
||||
--max-jobs="$MAX_JOBS" \
|
||||
|
@ -199,6 +204,7 @@ for host in ${HOSTS=x86_64-linux-gnu arm-linux-gnueabihf aarch64-linux-gnu riscv
|
|||
SOURCE_DATE_EPOCH="${SOURCE_DATE_EPOCH:?unable to determine value}" \
|
||||
${V:+V=1} \
|
||||
${SOURCES_PATH:+SOURCES_PATH="$SOURCES_PATH"} \
|
||||
OUTDIR=/outdir \
|
||||
bash -c "cd /bitcoin && bash contrib/guix/libexec/build.sh"
|
||||
)
|
||||
|
||||
|
|
|
@ -23,10 +23,6 @@ echo "At most ${MAX_JOBS:?not set} jobs will run at once..."
|
|||
# $HOSTs after successfully building.
|
||||
BASEPREFIX="${PWD}/depends"
|
||||
|
||||
# Setup an output directory for our build
|
||||
OUTDIR="${OUTDIR:-${PWD}/output}"
|
||||
[ -e "$OUTDIR" ] || mkdir -p "$OUTDIR"
|
||||
|
||||
# Setup the directory where our Bitcoin Core build for HOST will occur
|
||||
DISTSRC="${DISTSRC:-${PWD}/distsrc-${HOST}}"
|
||||
if [ -e "$DISTSRC" ]; then
|
||||
|
|
Loading…
Add table
Reference in a new issue