highperfocused/bitcoin
1
0
Fork 0
mirror of https://github.com/bitcoin/bitcoin.git synced 2025-08-27 20:38:07 +02:00
Code Issues Packages Projects Releases Wiki Activity

guix: only use native GCC 7 toolchain for Linux builds

Browse Source 
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.
This commit is contained in:
fanquake
2022-03-07 14:21:11 +00:00
parent c9ed9927bb
commit bb12870bac
1 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
contrib/guix/manifest.scm
View File

@@ -593,24 +593,30 @@ inspecting signatures in Mach-O binaries.")
;; Git ;; Git
git git
;; Tests ;; Tests
lief lief)
;; Native gcc 7 toolchain
gcc-toolchain-7
(list gcc-toolchain-7 "static"))
(let ((target (getenv "HOST"))) (let ((target (getenv "HOST")))
(cond ((string-suffix? "-mingw32" target) (cond ((string-suffix? "-mingw32" target)
;; Windows ;; 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-mingw-pthreads-cross-toolchain "x86_64-w64-mingw32")
(make-nsis-for-gcc-10 nsis-x86_64) (make-nsis-for-gcc-10 nsis-x86_64)
osslsigncode)) osslsigncode))
((string-contains target "-linux-") ((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 (make-bitcoin-cross-toolchain target
#:base-libc glibc-2.27/bitcoin-patched #:base-libc glibc-2.27/bitcoin-patched
#:base-kernel-headers linux-libre-headers-4.19)) #:base-kernel-headers linux-libre-headers-4.19))
(else (else
(make-bitcoin-cross-toolchain target))))) (make-bitcoin-cross-toolchain target)))))
((string-contains target "darwin") ((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 '()))))) (else '())))))