Skip to content

Commit d1592d2

Browse files
committed
guix: use gcc-12 to compile winpthreads
Currently, winpthreads is compiled with GCC 11, when we want to be using GCC 12 for all compilation.
1 parent b23690e commit d1592d2

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

contrib/guix/manifest.scm

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,10 @@ desirable for building Bitcoin Core release binaries."
131131
(define (make-mingw-pthreads-cross-toolchain target)
132132
"Create a cross-compilation toolchain package for TARGET"
133133
(let* ((xbinutils (binutils-mingw-patches (cross-binutils target)))
134-
(pthreads-xlibc mingw-w64-x86_64-winpthreads)
134+
(machine (substring target 0 (string-index target #\-)))
135+
(pthreads-xlibc (make-mingw-w64 machine
136+
#:xgcc (cross-gcc target #:xgcc (gcc-mingw-patches base-gcc))
137+
#:with-winpthreads? #t))
135138
(pthreads-xgcc (cross-gcc target
136139
#:xgcc (gcc-mingw-patches mingw-w64-base-gcc)
137140
#:xbinutils xbinutils

0 commit comments

Comments
 (0)