diff options
| author | fanquake <fanquake@gmail.com> | 2022-03-17 08:18:54 +0000 |
|---|---|---|
| committer | fanquake <fanquake@gmail.com> | 2022-03-17 09:59:34 +0000 |
| commit | 946b86cf573530f355707bcf6af10beae34a83b8 (patch) | |
| tree | 4ed160733a3c4ab0f1c366c41017bd5c57dc763f /contrib/guix/manifest.scm | |
| parent | 682962d9f642d1ec5ed56cd7ffc5085d14d3e06b (diff) | |
| download | bitcoin-946b86cf573530f355707bcf6af10beae34a83b8.tar.xz | |
Revert "build: Fix gcc-cross-x86_64-w64-mingw32-10.3.0 in Guix"
This reverts commit 7f2f35fe20c7706d547fa22a62521fe926f9c12b.
Diffstat (limited to 'contrib/guix/manifest.scm')
| -rw-r--r-- | contrib/guix/manifest.scm | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/contrib/guix/manifest.scm b/contrib/guix/manifest.scm index 008531e154..4348c77385 100644 --- a/contrib/guix/manifest.scm +++ b/contrib/guix/manifest.scm @@ -162,17 +162,13 @@ 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-gcc-without-newlib (make-ssp-fixed-gcc base-gcc)) + #:xgcc (make-ssp-fixed-gcc base-gcc) #:xbinutils xbinutils #:libc pthreads-xlibc)))) ;; Define a meta-package that propagates the resulting XBINUTILS, XLIBC, and |