Skip to content

Commit 8b41ede

Browse files
committed
guix: consolidate back to GCC 12 toolchain for all HOSTS
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.
1 parent 51ac479 commit 8b41ede

File tree

1 file changed

+4
-9
lines changed

1 file changed

+4
-9
lines changed

contrib/guix/manifest.scm

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -500,6 +500,7 @@ inspecting signatures in Mach-O binaries.")
500500
gzip
501501
xz
502502
;; Build tools
503+
gcc-toolchain-12
503504
cmake-minimal
504505
gnu-make
505506
libtool
@@ -515,22 +516,16 @@ inspecting signatures in Mach-O binaries.")
515516
python-lief)
516517
(let ((target (getenv "HOST")))
517518
(cond ((string-suffix? "-mingw32" target)
518-
(list ;; Native GCC 12 toolchain
519-
gcc-toolchain-12
520-
zip
519+
(list zip
521520
(make-mingw-pthreads-cross-toolchain "x86_64-w64-mingw32")
522521
nsis-x86_64
523522
nss-certs
524523
osslsigncode))
525524
((string-contains target "-linux-")
526-
(list ;; Native GCC 12 toolchain
527-
gcc-toolchain-12
528-
(list gcc-toolchain-12 "static")
525+
(list (list gcc-toolchain-12 "static")
529526
(make-bitcoin-cross-toolchain target)))
530527
((string-contains target "darwin")
531-
(list ;; Native GCC 11 toolchain
532-
gcc-toolchain-11
533-
clang-toolchain-18
528+
(list clang-toolchain-18
534529
lld-18
535530
(make-lld-wrapper lld-18 #:lld-as-ld? #t)
536531
python-signapple

0 commit comments

Comments
 (0)