Skip to content

Commit 71c51c1

Browse files
committed
Merge bitcoin/bitcoin#29673: guix: use GCC 11 in macOS build env
73d9230 guix: use GCC 11 for macOS builds (fanquake) Pull request description: Note that this is just the native compiler, which is used to build the toolchain we use to build the actual binaries. Partially motivated by #29091, where it could now be a bit confusing if we are explicitly using GCC 10 in our release toolchain, when our minimum required is 11 (this can't be bumped to 12 due to build issues with native tools). At the same time, remove `gcc-toolchain "static"` from the macOS build env. ACKs for top commit: hebasto: ACK 73d9230. Tree-SHA512: 31392290b327cc0e19498cf053b7c9eb19e70295933d650b29b29589356ad455d35b6addcdaae702a9635513c07070fb17d61bcb48445d3cb1a9d4a93aa6ddf3
2 parents 5de68e4 + 73d9230 commit 71c51c1

File tree

2 files changed

+12
-5
lines changed

2 files changed

+12
-5
lines changed

contrib/guix/libexec/build.sh

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,6 @@ store_path() {
6161
# Set environment variables to point the NATIVE toolchain to the right
6262
# includes/libs
6363
NATIVE_GCC="$(store_path gcc-toolchain)"
64-
NATIVE_GCC_STATIC="$(store_path gcc-toolchain static)"
6564

6665
unset LIBRARY_PATH
6766
unset CPATH
@@ -70,12 +69,21 @@ unset CPLUS_INCLUDE_PATH
7069
unset OBJC_INCLUDE_PATH
7170
unset OBJCPLUS_INCLUDE_PATH
7271

73-
export LIBRARY_PATH="${NATIVE_GCC}/lib:${NATIVE_GCC_STATIC}/lib"
7472
export C_INCLUDE_PATH="${NATIVE_GCC}/include"
7573
export CPLUS_INCLUDE_PATH="${NATIVE_GCC}/include/c++:${NATIVE_GCC}/include"
7674
export OBJC_INCLUDE_PATH="${NATIVE_GCC}/include"
7775
export OBJCPLUS_INCLUDE_PATH="${NATIVE_GCC}/include/c++:${NATIVE_GCC}/include"
7876

77+
case "$HOST" in
78+
*darwin*)
79+
export LIBRARY_PATH="${NATIVE_GCC}/lib"
80+
;;
81+
*)
82+
NATIVE_GCC_STATIC="$(store_path gcc-toolchain static)"
83+
export LIBRARY_PATH="${NATIVE_GCC}/lib:${NATIVE_GCC_STATIC}/lib"
84+
;;
85+
esac
86+
7987
# Set environment variables to point the CROSS toolchain to the right
8088
# includes/libs for $HOST
8189
case "$HOST" in

contrib/guix/manifest.scm

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -528,9 +528,8 @@ inspecting signatures in Mach-O binaries.")
528528
(list gcc-toolchain-12 "static")
529529
(make-bitcoin-cross-toolchain target)))
530530
((string-contains target "darwin")
531-
(list ;; Native GCC 10 toolchain
532-
gcc-toolchain-10
533-
(list gcc-toolchain-10 "static")
531+
(list ;; Native GCC 11 toolchain
532+
gcc-toolchain-11
534533
binutils
535534
clang-toolchain-17
536535
cmake-minimal

0 commit comments

Comments
 (0)