Mesa (master): scons: Use -static-libstdc++ on 32bits builds w/ Mingw-w64 too.

Jose Fonseca jrfonseca at kemper.freedesktop.org
Thu Nov 3 09:59:37 UTC 2011


Module: Mesa
Branch: master
Commit: 97213fd7417bae8ef65cd3a30c26968a45a6df94
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=97213fd7417bae8ef65cd3a30c26968a45a6df94

Author: José Fonseca <jfonseca at vmware.com>
Date:   Thu Nov  3 09:58:52 2011 +0000

scons: Use -static-libstdc++ on 32bits builds w/ Mingw-w64 too.

---

 scons/gallium.py |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/scons/gallium.py b/scons/gallium.py
index c3350b3..18be73f 100755
--- a/scons/gallium.py
+++ b/scons/gallium.py
@@ -540,7 +540,7 @@ def generate(env):
         if env['platform'] == 'windows':
             # Avoid depending on gcc runtime DLLs
             linkflags += ['-static-libgcc']
-            if env['machine'] == 'x86_64':
+            if 'w64' in env['CC'].split('-'):
                 linkflags += ['-static-libstdc++']
             # Handle the @xx symbol munging of DLL exports
             shlinkflags += ['-Wl,--enable-stdcall-fixup']




More information about the mesa-commit mailing list