Skip to content

Commit

Permalink
merge bitcoin#28370: remove GCC 10 workaround from NSIS
Browse files Browse the repository at this point in the history
  • Loading branch information
kwvg committed Nov 10, 2024
1 parent f155ecf commit 38c71d8
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 28 deletions.
6 changes: 1 addition & 5 deletions contrib/guix/manifest.scm
Original file line number Diff line number Diff line change
Expand Up @@ -143,10 +143,6 @@ chain for " target " development."))
(home-page (package-home-page pthreads-xgcc))
(license (package-license pthreads-xgcc)))))

(define (make-nsis-for-gcc-10 base-nsis)
(package-with-extra-patches base-nsis
(search-our-patches "nsis-gcc-10-memmove.patch")))

;; While LIEF is packaged in Guix, we maintain our own package,
;; to simplify building, and more easily apply updates.
;; Moreover, the Guix's package uses cmake, which caused build
Expand Down Expand Up @@ -607,7 +603,7 @@ inspecting signatures in Mach-O binaries.")
;; Windows
(list zip
(make-mingw-pthreads-cross-toolchain "x86_64-w64-mingw32")
(make-nsis-for-gcc-10 nsis-x86_64)
nsis-x86_64
nss-certs
osslsigncode))
((string-contains target "-linux-")
Expand Down
23 changes: 0 additions & 23 deletions contrib/guix/patches/nsis-gcc-10-memmove.patch

This file was deleted.

0 comments on commit 38c71d8

Please sign in to comment.