aboutsummaryrefslogtreecommitdiff
path: root/contrib/guix
diff options
context:
space:
mode:
authorCarl Dong <contact@carldong.me>2020-01-31 08:26:25 -0500
committerCarl Dong <contact@carldong.me>2020-04-02 17:19:55 -0400
commitdf953a4c9a6143f45864757b706c88b6fa70545a (patch)
treebf3c1f0cf57d48b56b46417be27db94de562c8ea /contrib/guix
parent91897c95e191d293eb27d8af15cbeafc5b8f3895 (diff)
guix: Appease shellcheck.
Diffstat (limited to 'contrib/guix')
-rwxr-xr-xcontrib/guix/guix-build.sh1
-rw-r--r--contrib/guix/libexec/build.sh8
2 files changed, 5 insertions, 4 deletions
diff --git a/contrib/guix/guix-build.sh b/contrib/guix/guix-build.sh
index 043ab69060..5e794e8063 100755
--- a/contrib/guix/guix-build.sh
+++ b/contrib/guix/guix-build.sh
@@ -22,6 +22,7 @@ time-machine() {
}
# Deterministically build Bitcoin Core for HOSTs (overriable by environment)
+# shellcheck disable=SC2153
for host in ${HOSTS=x86_64-linux-gnu arm-linux-gnueabihf aarch64-linux-gnu riscv64-linux-gnu x86_64-w64-mingw32}; do
# Display proper warning when the user interrupts the build
diff --git a/contrib/guix/libexec/build.sh b/contrib/guix/libexec/build.sh
index f74d32fe71..bb3917b860 100644
--- a/contrib/guix/libexec/build.sh
+++ b/contrib/guix/libexec/build.sh
@@ -55,10 +55,10 @@ case "$HOST" in
export CROSS_LIBRARY_PATH="${CROSS_GCC}/lib:${CROSS_GCC}/${HOST}/lib:${CROSS_GCC_LIB}:${CROSS_GLIBC}/lib"
;;
*linux*)
- CROSS_GLIBC="$(store_path glibc-cross-${HOST})"
- CROSS_GLIBC_STATIC="$(store_path glibc-cross-${HOST} static)"
- CROSS_KERNEL="$(store_path linux-libre-headers-cross-${HOST})"
- CROSS_GCC="$(store_path gcc-cross-${HOST})"
+ CROSS_GLIBC="$(store_path "glibc-cross-${HOST}")"
+ CROSS_GLIBC_STATIC="$(store_path "glibc-cross-${HOST}" static)"
+ CROSS_KERNEL="$(store_path "linux-libre-headers-cross-${HOST}")"
+ CROSS_GCC="$(store_path "gcc-cross-${HOST}")"
CROSS_GCC_LIBS=( "${CROSS_GCC}/lib/gcc/${HOST}"/* ) # This expands to an array of directories...
CROSS_GCC_LIB="${CROSS_GCC_LIBS[0]}" # ...we just want the first one (there should only be one)