aboutsummaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorHennadii Stepanov <32963518+hebasto@users.noreply.github.com>2022-02-15 12:35:52 +0200
committerHennadii Stepanov <32963518+hebasto@users.noreply.github.com>2022-02-15 15:28:31 +0200
commit7f2f35fe20c7706d547fa22a62521fe926f9c12b (patch)
tree2201373648109b618b81a469d2c824fddd39df77 /contrib
parent7164e00e1bc4e30e69b38a7ba9c557d4fc5d5f87 (diff)
downloadbitcoin-7f2f35fe20c7706d547fa22a62521fe926f9c12b.tar.xz
build: Fix gcc-cross-x86_64-w64-mingw32-10.3.0 in Guix
Diffstat (limited to 'contrib')
-rw-r--r--contrib/guix/manifest.scm6
1 files changed, 5 insertions, 1 deletions
diff --git a/contrib/guix/manifest.scm b/contrib/guix/manifest.scm
index 22b922dc9b..d296eb9543 100644
--- a/contrib/guix/manifest.scm
+++ b/contrib/guix/manifest.scm
@@ -162,13 +162,17 @@ desirable for building Bitcoin Core release binaries."
(define (make-gcc-with-pthreads gcc)
(package-with-extra-configure-variable gcc "--enable-threads" "posix"))
+;; Required to support std::filesystem for mingw-w64 target.
+(define (make-gcc-without-newlib gcc)
+ (package-with-extra-configure-variable gcc "--with-newlib" "no"))
+
(define (make-mingw-pthreads-cross-toolchain target)
"Create a cross-compilation toolchain package for TARGET"
(let* ((xbinutils (cross-binutils target))
(pthreads-xlibc mingw-w64-x86_64-winpthreads)
(pthreads-xgcc (make-gcc-with-pthreads
(cross-gcc target
- #:xgcc (make-ssp-fixed-gcc base-gcc)
+ #:xgcc (make-gcc-without-newlib (make-ssp-fixed-gcc base-gcc))
#:xbinutils xbinutils
#:libc pthreads-xlibc))))
;; Define a meta-package that propagates the resulting XBINUTILS, XLIBC, and