Skip to content

Commit bb12870

Browse files
committed
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.
1 parent c9ed992 commit bb12870

File tree

1 file changed

+13
-7
lines changed

1 file changed

+13
-7
lines changed

contrib/guix/manifest.scm

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -593,24 +593,30 @@ inspecting signatures in Mach-O binaries.")
593593
;; Git
594594
git
595595
;; Tests
596-
lief
597-
;; Native gcc 7 toolchain
598-
gcc-toolchain-7
599-
(list gcc-toolchain-7 "static"))
596+
lief)
600597
(let ((target (getenv "HOST")))
601598
(cond ((string-suffix? "-mingw32" target)
602599
;; Windows
603-
(list zip
600+
(list ;; Native GCC 10 toolchain
601+
gcc-toolchain-10
602+
(list gcc-toolchain-10 "static")
603+
zip
604604
(make-mingw-pthreads-cross-toolchain "x86_64-w64-mingw32")
605605
(make-nsis-for-gcc-10 nsis-x86_64)
606606
osslsigncode))
607607
((string-contains target "-linux-")
608-
(list (cond ((string-contains target "riscv64-")
608+
(list ;; Native GCC 7 toolchain
609+
gcc-toolchain-7
610+
(list gcc-toolchain-7 "static")
611+
(cond ((string-contains target "riscv64-")
609612
(make-bitcoin-cross-toolchain target
610613
#:base-libc glibc-2.27/bitcoin-patched
611614
#:base-kernel-headers linux-libre-headers-4.19))
612615
(else
613616
(make-bitcoin-cross-toolchain target)))))
614617
((string-contains target "darwin")
615-
(list clang-toolchain-10 binutils cmake xorriso python-signapple))
618+
(list ;; Native GCC 10 toolchain
619+
gcc-toolchain-10
620+
(list gcc-toolchain-10 "static")
621+
clang-toolchain-10 binutils cmake xorriso python-signapple))
616622
(else '())))))

0 commit comments

Comments
 (0)