mirror of
https://github.com/bitcoin/bitcoin.git
synced 2025-01-25 02:33:24 -03:00
guix: remove GCC 10 workaround from NSIS
Fixed upstream in 3.06, see
229b6136c4
.
https://sourceforge.net/p/nsis/bugs/1248/
This commit is contained in:
parent
ab42b2ebdb
commit
588068d5a1
2 changed files with 1 additions and 28 deletions
|
@ -142,10 +142,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")))
|
|
||||||
|
|
||||||
;; While LIEF is packaged in Guix, we maintain our own package,
|
;; While LIEF is packaged in Guix, we maintain our own package,
|
||||||
;; to simplify building, and more easily apply updates.
|
;; to simplify building, and more easily apply updates.
|
||||||
;; Moreover, the Guix's package uses cmake, which caused build
|
;; Moreover, the Guix's package uses cmake, which caused build
|
||||||
|
@ -604,7 +600,7 @@ inspecting signatures in Mach-O binaries.")
|
||||||
;; Windows
|
;; Windows
|
||||||
(list zip
|
(list zip
|
||||||
(make-mingw-pthreads-cross-toolchain "x86_64-w64-mingw32")
|
(make-mingw-pthreads-cross-toolchain "x86_64-w64-mingw32")
|
||||||
(make-nsis-for-gcc-10 nsis-x86_64)
|
nsis-x86_64
|
||||||
nss-certs
|
nss-certs
|
||||||
osslsigncode))
|
osslsigncode))
|
||||||
((string-contains target "-linux-")
|
((string-contains target "-linux-")
|
||||||
|
|
|
@ -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'])
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue