Mercurial > mxe-octave

comparison src/nsis-2-fixes.patch @ 4612:56320dd51677

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
nsis: plugin requires static gcc linking * src/nsis-2-fixes.patch: add back static linking against libgcc
author John D
date Sat, 03 Mar 2018 19:42:43 -0500
parents a62c4469e2aa
children 1220e3b8427e
comparison
equal deleted inserted replaced
4611:504cb71a29a9 4612:56320dd51677
1 diff -uNr a/SCons/Config/gnu b/SCons/Config/gnu 1 diff -ur nsis-3.03-src.orig/SCons/Config/gnu nsis-3.03-src/SCons/Config/gnu
2 --- a/SCons/Config/gnu 2017-10-06 15:30:20.000000000 -0400 2 --- nsis-3.03-src.orig/SCons/Config/gnu 2018-03-03 19:38:08.620291177 -0500
3 +++ b/SCons/Config/gnu 2018-02-26 09:36:48.769368160 -0500 3 +++ nsis-3.03-src/SCons/Config/gnu 2018-03-03 19:38:20.109576191 -0500
4 @@ -45,11 +45,6 @@ 4 @@ -45,11 +45,6 @@
5 defenv['MSVCRT_FLAG'] = '' 5 defenv['MSVCRT_FLAG'] = ''
6 defenv['STDCALL'] = '"__attribute__((__stdcall__))"' 6 defenv['STDCALL'] = '"__attribute__((__stdcall__))"'
7 7
8 -# Don't allow mingw to link with LIBGCC*.DLL and LIBSTDC++-*.DLL 8 -# Don't allow mingw to link with LIBGCC*.DLL and LIBSTDC++-*.DLL
11 - defenv.Append(LINKFLAGS = ['-static-libstdc++']) 11 - defenv.Append(LINKFLAGS = ['-static-libstdc++'])
12 - 12 -
13 ### defines 13 ### defines
14 14
15 defenv.Append(CPPDEFINES = [('NSISCALL', '$STDCALL')]) 15 defenv.Append(CPPDEFINES = [('NSISCALL', '$STDCALL')])
16 @@ -140,8 +135,6 @@ 16 @@ -141,7 +136,6 @@
17 plugin_env.Append(LINKFLAGS = ['-mwindows']) # build windows executables
18 plugin_env.Append(LINKFLAGS = ['$ALIGN_FLAG']) # 512 bytes align 17 plugin_env.Append(LINKFLAGS = ['$ALIGN_FLAG']) # 512 bytes align
19 plugin_env.Append(LINKFLAGS = ['$MAP_FLAG']) # generate map file 18 plugin_env.Append(LINKFLAGS = ['$MAP_FLAG']) # generate map file
20 -plugin_env.Append(LINKFLAGS = ['-static-libgcc']) # remove libgcc*.dll dependency 19 plugin_env.Append(LINKFLAGS = ['-static-libgcc']) # remove libgcc*.dll dependency
21 -plugin_env.Append(LINKFLAGS = ['-static-libstdc++']) # remove libstdc++*.dll dependency 20 -plugin_env.Append(LINKFLAGS = ['-static-libstdc++']) # remove libstdc++*.dll dependency
22 21
23 plugin_uenv = plugin_env.Clone() 22 plugin_uenv = plugin_env.Clone()
24 plugin_uenv.Append(CPPDEFINES = ['_UNICODE', 'UNICODE']) 23 plugin_uenv.Append(CPPDEFINES = ['_UNICODE', 'UNICODE'])