Mercurial > mxe-octave
changeset 4489:d50a2adc8d75
mesa: don't force static libstdc++ or libgcc.
| author | John W. Eaton <jwe@octave.org> |
|---|---|
| date | Thu, 05 Oct 2017 08:57:15 -0400 |
| parents | 8f9bee27223f |
| children | 788dc298ec00 |
| files | dist-files.mk src/mesa-1-fixes.patch |
| diffstat | 2 files changed, 14 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/dist-files.mk Thu Oct 05 10:44:53 2017 -0400 +++ b/dist-files.mk Thu Oct 05 08:57:15 2017 -0400 @@ -311,6 +311,7 @@ lzo.mk \ matio.mk \ mdbtools.mk \ + mesa-1-fixes.patch \ mesa.mk \ mingw-cairo-1-ssize-t-defined.patch \ mingw-cfitsio-1-fixes.patch \
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/mesa-1-fixes.patch Thu Oct 05 08:57:15 2017 -0400 @@ -0,0 +1,13 @@ +diff -uNr a/scons/gallium.py b/scons/gallium.py +--- a/scons/gallium.py 2017-09-17 19:03:22.000000000 -0400 ++++ b/scons/gallium.py 2017-10-04 19:24:29.499373623 -0400 +@@ -580,9 +580,6 @@ + '-Wl,--dynamicbase', # ASLR + ] + # Avoid depending on gcc runtime DLLs +- linkflags += ['-static-libgcc'] +- if 'w64' in env['CC'].split('-'): +- linkflags += ['-static-libstdc++'] + # Handle the @xx symbol munging of DLL exports + shlinkflags += ['-Wl,--enable-stdcall-fixup'] + #shlinkflags += ['-Wl,--kill-at']