guix: remove GCC 10 workaround from NSIS

Based on Bitcoin PR #28370
This commit is contained in:
tobtoht 2023-09-07 11:03:28 +02:00
parent 4bb3e74aa9
commit 4091636ef3
No known key found for this signature in database
GPG key ID: E45B10DD027D2472
2 changed files with 1 additions and 29 deletions

View file

@ -178,11 +178,6 @@ chain for " target " development."))
(home-page (package-home-page pthreads-xgcc)) (home-page (package-home-page pthreads-xgcc))
(license (package-license 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"
"nsis-disable-installer-reloc.patch")))
(define-public mingw-w64-base-gcc (define-public mingw-w64-base-gcc
(package (package
(inherit base-gcc) (inherit base-gcc)
@ -348,7 +343,7 @@ chain for " target " development."))
(cond ((string-suffix? "-mingw32" target) (cond ((string-suffix? "-mingw32" target)
;; Windows ;; Windows
(list (make-mingw-pthreads-cross-toolchain "x86_64-w64-mingw32") (list (make-mingw-pthreads-cross-toolchain "x86_64-w64-mingw32")
(make-nsis-for-gcc-10 nsis-x86_64))) nsis-x86_64))
((string-contains target "-linux-") ((string-contains target "-linux-")
(list (make-bitcoin-cross-toolchain target))) (list (make-bitcoin-cross-toolchain target)))
((string-contains target "darwin") ((string-contains target "darwin")

View file

@ -1,23 +0,0 @@
commit f6df41524e703dc471e283e566a48e05a735b7f2
Author: Anders <anders_k@users.sourceforge.net>
Date: Sat Jun 27 23:18:45 2020 +0000
Don't let GCC 10 generate memmove calls (bug #1248)
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@7189 212acab6-be3b-0410-9dea-997c60f758d6
diff --git a/SCons/Config/gnu b/SCons/Config/gnu
index bfcb362d..21fa446b 100644
--- a/SCons/Config/gnu
+++ b/SCons/Config/gnu
@@ -103,6 +103,10 @@ stub_env.Append(LINKFLAGS = ['$NODEFLIBS_FLAG']) # no standard libraries
stub_env.Append(LINKFLAGS = ['$ALIGN_FLAG']) # 512 bytes align
stub_env.Append(LINKFLAGS = ['$MAP_FLAG']) # generate map file
+conf = FlagsConfigure(stub_env)
+conf.CheckCompileFlag('-fno-tree-loop-distribute-patterns') # GCC 10: Don't generate msvcrt!memmove calls (bug #1248)
+conf.Finish()
+
stub_uenv = stub_env.Clone()
stub_uenv.Append(CPPDEFINES = ['_UNICODE', 'UNICODE'])