diff options
| author | fanquake <fanquake@gmail.com> | 2024-04-04 12:01:22 +0100 |
|---|---|---|
| committer | fanquake <fanquake@gmail.com> | 2024-04-04 12:02:13 +0100 |
| commit | 71c51c161d476cc495afdb7864283fdb84d2dc0c (patch) | |
| tree | 887d800030bc23e8303fc078cdb36fdbcdb56d6f /contrib/guix/manifest.scm | |
| parent | 5de68e45c280f98f70bd29f82495927ab773f68a (diff) | |
| parent | 73d92309d7c3584de28d0dd97d45773571383eb7 (diff) | |
| download | bitcoin-71c51c161d476cc495afdb7864283fdb84d2dc0c.tar.xz | |
Merge bitcoin/bitcoin#29673: guix: use GCC 11 in macOS build env
73d92309d7c3584de28d0dd97d45773571383eb7 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 73d92309d7c3584de28d0dd97d45773571383eb7.
Tree-SHA512: 31392290b327cc0e19498cf053b7c9eb19e70295933d650b29b29589356ad455d35b6addcdaae702a9635513c07070fb17d61bcb48445d3cb1a9d4a93aa6ddf3
Diffstat (limited to 'contrib/guix/manifest.scm')
| -rw-r--r-- | contrib/guix/manifest.scm | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/contrib/guix/manifest.scm b/contrib/guix/manifest.scm index e24a61bf9d..8f0147743d 100644 --- a/contrib/guix/manifest.scm +++ b/contrib/guix/manifest.scm @@ -528,9 +528,8 @@ inspecting signatures in Mach-O binaries.") (list gcc-toolchain-12 "static") (make-bitcoin-cross-toolchain target))) ((string-contains target "darwin") - (list ;; Native GCC 10 toolchain - gcc-toolchain-10 - (list gcc-toolchain-10 "static") + (list ;; Native GCC 11 toolchain + gcc-toolchain-11 binutils clang-toolchain-17 cmake-minimal |