Skip to content

Commit 946b86c

Browse files
committed
Revert "build: Fix gcc-cross-x86_64-w64-mingw32-10.3.0 in Guix"
This reverts commit 7f2f35f.
1 parent 682962d commit 946b86c

File tree

1 file changed

+1
-5
lines changed

1 file changed

+1
-5
lines changed

contrib/guix/manifest.scm

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -162,17 +162,13 @@ desirable for building Bitcoin Core release binaries."
162162
(define (make-gcc-with-pthreads gcc)
163163
(package-with-extra-configure-variable gcc "--enable-threads" "posix"))
164164

165-
;; Required to support std::filesystem for mingw-w64 target.
166-
(define (make-gcc-without-newlib gcc)
167-
(package-with-extra-configure-variable gcc "--with-newlib" "no"))
168-
169165
(define (make-mingw-pthreads-cross-toolchain target)
170166
"Create a cross-compilation toolchain package for TARGET"
171167
(let* ((xbinutils (cross-binutils target))
172168
(pthreads-xlibc mingw-w64-x86_64-winpthreads)
173169
(pthreads-xgcc (make-gcc-with-pthreads
174170
(cross-gcc target
175-
#:xgcc (make-gcc-without-newlib (make-ssp-fixed-gcc base-gcc))
171+
#:xgcc (make-ssp-fixed-gcc base-gcc)
176172
#:xbinutils xbinutils
177173
#:libc pthreads-xlibc))))
178174
;; Define a meta-package that propagates the resulting XBINUTILS, XLIBC, and

0 commit comments

Comments
 (0)