Skip to content

Commit 38c71d8

Browse files
committed
merge bitcoin#28370: remove GCC 10 workaround from NSIS
1 parent f155ecf commit 38c71d8

File tree

2 files changed

+1
-28
lines changed

2 files changed

+1
-28
lines changed

contrib/guix/manifest.scm

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -143,10 +143,6 @@ chain for " target " development."))
143143
(home-page (package-home-page pthreads-xgcc))
144144
(license (package-license pthreads-xgcc)))))
145145

146-
(define (make-nsis-for-gcc-10 base-nsis)
147-
(package-with-extra-patches base-nsis
148-
(search-our-patches "nsis-gcc-10-memmove.patch")))
149-
150146
;; While LIEF is packaged in Guix, we maintain our own package,
151147
;; to simplify building, and more easily apply updates.
152148
;; Moreover, the Guix's package uses cmake, which caused build
@@ -607,7 +603,7 @@ inspecting signatures in Mach-O binaries.")
607603
;; Windows
608604
(list zip
609605
(make-mingw-pthreads-cross-toolchain "x86_64-w64-mingw32")
610-
(make-nsis-for-gcc-10 nsis-x86_64)
606+
nsis-x86_64
611607
nss-certs
612608
osslsigncode))
613609
((string-contains target "-linux-")

contrib/guix/patches/nsis-gcc-10-memmove.patch

Lines changed: 0 additions & 23 deletions
This file was deleted.

0 commit comments

Comments
 (0)