scons: make embedding orthogonal to the platform

[mesa.git] / scons / crossmingw.py

diff --git a/scons/crossmingw.py b/scons/crossmingw.py
index 8adc8f5c970be3693f017ba501c6e370d46e69b2..cc046229e2c6dcfc93da4099c3633bf107087330 100644 (file)
--- a/scons/crossmingw.py
+++ b/scons/crossmingw.py
@@ -54,11 +54,13 @@ prefixes32 = SCons.Util.Split("""
     i586-mingw32msvc-
     i686-mingw32msvc-
     i686-pc-mingw32-
+    i686-w64-mingw32-
 """)
 prefixes64 = SCons.Util.Split("""
     amd64-mingw32-
     amd64-mingw32msvc-
     amd64-pc-mingw32-
+    x86_64-w64-mingw32-
 """)
 
 def find(env):
@@ -192,5 +194,8 @@ def generate(env):
     env.AppendUnique(SHLINKFLAGS = ['-Wl,--enable-stdcall-fixup'])
     #env.AppendUnique(SHLINKFLAGS = ['-Wl,--kill-at'])
 
+    # Avoid depending on gcc runtime DLLs
+    env.AppendUnique(LINKFLAGS = ['-static-libgcc'])
+
 def exists(env):
     return find(env)