partial bitcoin#30511: GCC 12 consolidation

excludes:
- 8b41ede55ebbc6978deb3f4fad5e18b76b372506
This commit is contained in:
Kittywhiskers Van Gogh 2024-07-23 09:42:04 +01:00
parent 06f54318b3
commit cfc6cba4ea
No known key found for this signature in database
GPG Key ID: 30CD0C065E5C4AAD

View File

@ -28,6 +28,7 @@
(guix build-system gnu) (guix build-system gnu)
(guix build-system python) (guix build-system python)
(guix build-system trivial) (guix build-system trivial)
(guix download)
(guix gexp) (guix gexp)
(guix git-download) (guix git-download)
((guix licenses) #:prefix license:) ((guix licenses) #:prefix license:)
@ -94,7 +95,18 @@ chain for " target " development."))
(home-page (package-home-page xgcc)) (home-page (package-home-page xgcc))
(license (package-license xgcc))))) (license (package-license xgcc)))))
(define base-gcc gcc-12) (define base-gcc
(package
(inherit gcc-12) ;; 12.3.0
(version "12.4.0")
(source (origin
(method url-fetch)
(uri (string-append "mirror://gnu/gcc/gcc-"
version "/gcc-" version ".tar.xz"))
(sha256
(base32
"0xcida8l2wykvvzvpcrcn649gj0ijn64gwxbplacpg6c0hk6akvh"))))))
(define base-linux-kernel-headers linux-libre-headers-6.1) (define base-linux-kernel-headers linux-libre-headers-6.1)
(define* (make-bitcoin-cross-toolchain target (define* (make-bitcoin-cross-toolchain target
@ -122,7 +134,10 @@ desirable for building Dash Core release binaries."
(define (make-mingw-pthreads-cross-toolchain target) (define (make-mingw-pthreads-cross-toolchain target)
"Create a cross-compilation toolchain package for TARGET" "Create a cross-compilation toolchain package for TARGET"
(let* ((xbinutils (binutils-mingw-patches (cross-binutils target))) (let* ((xbinutils (binutils-mingw-patches (cross-binutils target)))
(pthreads-xlibc mingw-w64-x86_64-winpthreads) (machine (substring target 0 (string-index target #\-)))
(pthreads-xlibc (make-mingw-w64 machine
#:xgcc (cross-gcc target #:xgcc (gcc-mingw-patches base-gcc))
#:with-winpthreads? #t))
(pthreads-xgcc (cross-gcc target (pthreads-xgcc (cross-gcc target
#:xgcc (gcc-mingw-patches mingw-w64-base-gcc) #:xgcc (gcc-mingw-patches mingw-w64-base-gcc)
#:xbinutils xbinutils #:xbinutils xbinutils