X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=scons%2Fcrossmingw.py;h=cc046229e2c6dcfc93da4099c3633bf107087330;hb=1a57717bbe8a2cedf2e1bb72cfd7ec85cd2350fc;hp=9cb0b89e3c7849539e05f48f010d0ae797c6b36d;hpb=fd56bee6c4de28da194333f93b52c40f1deb6163;p=mesa.git

diff --git a/scons/crossmingw.py b/scons/crossmingw.py
index 9cb0b89e3c7..cc046229e2c 100644
--- a/scons/crossmingw.py
+++ b/scons/crossmingw.py
@@ -42,7 +42,7 @@ import SCons.Tool
 import SCons.Util
 
 # This is what we search for to find mingw:
-prefixes = SCons.Util.Split("""
+prefixes32 = SCons.Util.Split("""
     mingw32-
     mingw32msvc-
     i386-mingw32-
@@ -53,9 +53,21 @@ prefixes = SCons.Util.Split("""
     i486-mingw32msvc-
     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):
+    if env['machine'] == 'x86_64':
+        prefixes = prefixes64
+    else:
+        prefixes = prefixes32
     for prefix in prefixes:
         # First search in the SCons path and then the OS path:
         if env.WhereIs(prefix + 'gcc') or SCons.Util.WhereIs(prefix + 'gcc'):
@@ -175,11 +187,15 @@ def generate(env):
 
     # MinGW port of gdb does not handle well dwarf debug info which is the
     # default in recent gcc versions
-    env.AppendUnique(CFLAGS = ['-gstabs'])
+    env.AppendUnique(CCFLAGS = ['-gstabs'])
 
+    env.AppendUnique(CPPDEFINES = [('__MSVCRT_VERSION__', '0x0700')])
     #env.AppendUnique(LIBS = ['iberty'])
     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)