mirrors/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-02-22 23:07:59 +01:00
Code Issues Projects Releases Wiki Activity

guix: consolidate back to GCC 12 toolchain for all HOSTS

Browse source 
Using GCC 11 for the macOS build hasn't been required since #21778, and
at this point, given a toolchain is still needed (#30206), it makes more
sense to (re-)use 12, rather than make all builders compile another
GCC toolchain.
This commit is contained in:
fanquake 2024-07-23 12:19:54 +01:00
parent 51ac4792e5
commit 8b41ede55e
No known key found for this signature in database
GPG key ID: 2EEB9F5CC09526C1
1 changed files with 4 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
contrib/guix/manifest.scm
View file

@ -500,6 +500,7 @@ inspecting signatures in Mach-O binaries.")
gzip gzip
xz xz
;; Build tools ;; Build tools
gcc-toolchain-12
cmake-minimal cmake-minimal
gnu-make gnu-make
libtool libtool
@ -515,22 +516,16 @@ inspecting signatures in Mach-O binaries.")
python-lief) python-lief)
(let ((target (getenv "HOST"))) (let ((target (getenv "HOST")))
(cond ((string-suffix? "-mingw32" target) (cond ((string-suffix? "-mingw32" target)
(list ;; Native GCC 12 toolchain (list zip
gcc-toolchain-12
zip
(make-mingw-pthreads-cross-toolchain "x86_64-w64-mingw32") (make-mingw-pthreads-cross-toolchain "x86_64-w64-mingw32")
nsis-x86_64 nsis-x86_64
nss-certs nss-certs
osslsigncode)) osslsigncode))
((string-contains target "-linux-") ((string-contains target "-linux-")
(list ;; Native GCC 12 toolchain (list (list gcc-toolchain-12 "static")
gcc-toolchain-12
(list gcc-toolchain-12 "static")
(make-bitcoin-cross-toolchain target))) (make-bitcoin-cross-toolchain target)))
((string-contains target "darwin") ((string-contains target "darwin")
(list ;; Native GCC 11 toolchain (list clang-toolchain-18
gcc-toolchain-11
clang-toolchain-18
lld-18 lld-18
(make-lld-wrapper lld-18 #:lld-as-ld? #t) (make-lld-wrapper lld-18 #:lld-as-ld? #t)
python-signapple python-signapple