Mercurial > mxe-octave
annotate src/nsis-2-fixes.patch @ 7207:9ed6500e56d3 default tip @
maint: Merge release to default.
author | Markus Mützel <markus.muetzel@gmx.de> |
---|---|
date | Fri, 17 May 2024 20:16:41 +0200 |
parents | 1220e3b8427e |
children |
rev | line source |
---|---|
7075
1220e3b8427e
nsis: update to nsisbi v7405-1
John Donoghue <john.donoghue@ieee.org>
parents:
4612
diff
changeset
|
1 diff -ur nsis-code-7405-1-NSIS-trunk.orig/SCons/Config/gnu nsis-code-7405-1-NSIS-trunk/SCons/Config/gnu |
1220e3b8427e
nsis: update to nsisbi v7405-1
John Donoghue <john.donoghue@ieee.org>
parents:
4612
diff
changeset
|
2 --- nsis-code-7405-1-NSIS-trunk.orig/SCons/Config/gnu 2024-02-15 10:57:22.343383597 -0500 |
1220e3b8427e
nsis: update to nsisbi v7405-1
John Donoghue <john.donoghue@ieee.org>
parents:
4612
diff
changeset
|
3 +++ nsis-code-7405-1-NSIS-trunk/SCons/Config/gnu 2024-02-15 11:00:48.067246323 -0500 |
1220e3b8427e
nsis: update to nsisbi v7405-1
John Donoghue <john.donoghue@ieee.org>
parents:
4612
diff
changeset
|
4 @@ -54,7 +54,7 @@ |
1220e3b8427e
nsis: update to nsisbi v7405-1
John Donoghue <john.donoghue@ieee.org>
parents:
4612
diff
changeset
|
5 # Don't allow mingw to link with LIBGCC*.DLL and LIBSTDC++-*.DLL |
1220e3b8427e
nsis: update to nsisbi v7405-1
John Donoghue <john.donoghue@ieee.org>
parents:
4612
diff
changeset
|
6 def configure_static_libs(env): |
1220e3b8427e
nsis: update to nsisbi v7405-1
John Donoghue <john.donoghue@ieee.org>
parents:
4612
diff
changeset
|
7 env.Append(LINKFLAGS = ['-static-libgcc']) |
1220e3b8427e
nsis: update to nsisbi v7405-1
John Donoghue <john.donoghue@ieee.org>
parents:
4612
diff
changeset
|
8 - env.Append(LINKFLAGS = ['-static-libstdc++']) # MinGW GCC 4.5.2 warns about unrecognized option but it also actually needs it! |
1220e3b8427e
nsis: update to nsisbi v7405-1
John Donoghue <john.donoghue@ieee.org>
parents:
4612
diff
changeset
|
9 + #env.Append(LINKFLAGS = ['-static-libstdc++']) # MinGW GCC 4.5.2 warns about unrecognized option but it also actually needs it! |
4605 | 10 |
7075
1220e3b8427e
nsis: update to nsisbi v7405-1
John Donoghue <john.donoghue@ieee.org>
parents:
4612
diff
changeset
|
11 if defenv['PLATFORM'] == 'win32': |
1220e3b8427e
nsis: update to nsisbi v7405-1
John Donoghue <john.donoghue@ieee.org>
parents:
4612
diff
changeset
|
12 configure_static_libs(defenv) |