diff options
| author | fanquake <fanquake@gmail.com> | 2022-03-07 14:21:11 +0000 |
|---|---|---|
| committer | fanquake <fanquake@gmail.com> | 2022-03-07 15:18:41 +0000 |
| commit | bb12870bac230960bbe2df35f579570e465d8ea4 (patch) | |
| tree | 1b6ce12a3e9ebe13da92ce00fb0fa9ac7842cbd0 | |
| parent | c9ed9927bbb7c422c4e01c0c1adc9722b8671009 (diff) | |
| download | bitcoin-bb12870bac230960bbe2df35f579570e465d8ea4.tar.xz | |
guix: only use native GCC 7 toolchain for Linux builds
The macOS and Windows builds do not require a GCC 7 toolchain, and this
is actually causing build issues, i.e #24211. So switch to using a GCC
10 native toolchain for both.
| -rw-r--r-- | contrib/guix/manifest.scm | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/contrib/guix/manifest.scm b/contrib/guix/manifest.scm index d296eb9543..143a32bbb6 100644 --- a/contrib/guix/manifest.scm +++ b/contrib/guix/manifest.scm @@ -593,24 +593,30 @@ inspecting signatures in Mach-O binaries.") ;; Git git ;; Tests - lief - ;; Native gcc 7 toolchain - gcc-toolchain-7 - (list gcc-toolchain-7 "static")) + lief) (let ((target (getenv "HOST"))) (cond ((string-suffix? "-mingw32" target) ;; Windows - (list zip + (list ;; Native GCC 10 toolchain + gcc-toolchain-10 + (list gcc-toolchain-10 "static") + zip (make-mingw-pthreads-cross-toolchain "x86_64-w64-mingw32") (make-nsis-for-gcc-10 nsis-x86_64) osslsigncode)) ((string-contains target "-linux-") - (list (cond ((string-contains target "riscv64-") + (list ;; Native GCC 7 toolchain + gcc-toolchain-7 + (list gcc-toolchain-7 "static") + (cond ((string-contains target "riscv64-") (make-bitcoin-cross-toolchain target #:base-libc glibc-2.27/bitcoin-patched #:base-kernel-headers linux-libre-headers-4.19)) (else (make-bitcoin-cross-toolchain target))))) ((string-contains target "darwin") - (list clang-toolchain-10 binutils cmake xorriso python-signapple)) + (list ;; Native GCC 10 toolchain + gcc-toolchain-10 + (list gcc-toolchain-10 "static") + clang-toolchain-10 binutils cmake xorriso python-signapple)) (else '()))))) |