diff options
| author | fanquake <fanquake@gmail.com> | 2024-07-23 12:19:54 +0100 |
|---|---|---|
| committer | fanquake <fanquake@gmail.com> | 2024-07-23 13:54:14 +0100 |
| commit | 8b41ede55ebbc6978deb3f4fad5e18b76b372506 (patch) | |
| tree | ceb191633bd193efd58e08c831713cb649787225 /contrib/guix | |
| parent | 51ac4792e571623af69a6c3e1031900ea962dce1 (diff) | |
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.
Diffstat (limited to 'contrib/guix')
| -rw-r--r-- | contrib/guix/manifest.scm | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/contrib/guix/manifest.scm b/contrib/guix/manifest.scm index 44fbfa1c0b..db8e74bb77 100644 --- a/contrib/guix/manifest.scm +++ b/contrib/guix/manifest.scm @@ -500,6 +500,7 @@ inspecting signatures in Mach-O binaries.") gzip xz ;; Build tools + gcc-toolchain-12 cmake-minimal gnu-make libtool @@ -515,22 +516,16 @@ inspecting signatures in Mach-O binaries.") python-lief) (let ((target (getenv "HOST"))) (cond ((string-suffix? "-mingw32" target) - (list ;; Native GCC 12 toolchain - gcc-toolchain-12 - zip + (list zip (make-mingw-pthreads-cross-toolchain "x86_64-w64-mingw32") nsis-x86_64 nss-certs osslsigncode)) ((string-contains target "-linux-") - (list ;; Native GCC 12 toolchain - gcc-toolchain-12 - (list gcc-toolchain-12 "static") + (list (list gcc-toolchain-12 "static") (make-bitcoin-cross-toolchain target))) ((string-contains target "darwin") - (list ;; Native GCC 11 toolchain - gcc-toolchain-11 - clang-toolchain-18 + (list clang-toolchain-18 lld-18 (make-lld-wrapper lld-18 #:lld-as-ld? #t) python-signapple |