diff options
| author | fanquake <fanquake@gmail.com> | 2023-06-14 16:58:44 +0100 |
|---|---|---|
| committer | fanquake <fanquake@gmail.com> | 2024-03-12 16:26:27 +0000 |
| commit | 001412a4d2da685cd881fc37bbe87af427edc21a (patch) | |
| tree | ada21a2330728b38bff0c918355d15fe49775ee0 /contrib/guix/manifest.scm | |
| parent | ce54330cf6c5ce37e1369e5e8cb58923233d67ca (diff) | |
| download | bitcoin-001412a4d2da685cd881fc37bbe87af427edc21a.tar.xz | |
guix: use GCC 12.3.0
Retain native GCC 10 toolchain for macOS, to prevent compile failures in
native tools (this will be removed entirely when we tansition to LLD).
Update the vmov-alignment patch, for changes in GCC 12.
Diffstat (limited to 'contrib/guix/manifest.scm')
| -rw-r--r-- | contrib/guix/manifest.scm | 25 |
1 files changed, 17 insertions, 8 deletions
diff --git a/contrib/guix/manifest.scm b/contrib/guix/manifest.scm index 7335596107..3353c8a874 100644 --- a/contrib/guix/manifest.scm +++ b/contrib/guix/manifest.scm @@ -91,7 +91,7 @@ chain for " target " development.")) (home-page (package-home-page xgcc)) (license (package-license xgcc))))) -(define base-gcc gcc-10) +(define base-gcc gcc-12) (define base-linux-kernel-headers linux-libre-headers-6.1) (define* (make-bitcoin-cross-toolchain target @@ -505,9 +505,6 @@ inspecting signatures in Mach-O binaries.") automake pkg-config bison - ;; Native GCC 10 toolchain - gcc-toolchain-10 - (list gcc-toolchain-10 "static") ;; Scripting python-minimal ;; (3.10) ;; Git @@ -516,14 +513,26 @@ inspecting signatures in Mach-O binaries.") python-lief) (let ((target (getenv "HOST"))) (cond ((string-suffix? "-mingw32" target) - ;; Windows - (list zip + (list ;; Native GCC 12 toolchain + gcc-toolchain-12 + (list gcc-toolchain-12 "static") + zip (make-mingw-pthreads-cross-toolchain "x86_64-w64-mingw32") nsis-x86_64 nss-certs osslsigncode)) ((string-contains target "-linux-") - (list (make-bitcoin-cross-toolchain target))) + (list ;; Native GCC 12 toolchain + gcc-toolchain-12 + (list gcc-toolchain-12 "static") + (make-bitcoin-cross-toolchain target))) ((string-contains target "darwin") - (list clang-toolchain-17 binutils cmake-minimal python-signapple zip)) + (list ;; Native GCC 10 toolchain + gcc-toolchain-10 + (list gcc-toolchain-10 "static") + binutils + clang-toolchain-17 + cmake-minimal + python-signapple + zip)) (else '()))))) |