X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=scons%2Fcrossmingw.py;h=23c56c0a2da573141a61b8756d47ee402fa92f53;hb=2a8145d36b0f04d0f26c1628222a8b5c4830f435;hp=4a695a440d65c5788b1308fe0e345af7d2e7891c;hpb=f8e6d19f3f40931be741b44d3edf210c38e13f0f;p=mesa.git

diff --git a/scons/crossmingw.py b/scons/crossmingw.py
index 4a695a440d6..23c56c0a2da 100644
--- a/scons/crossmingw.py
+++ b/scons/crossmingw.py
@@ -57,10 +57,10 @@ prefixes32 = SCons.Util.Split("""
     i686-w64-mingw32-
 """)
 prefixes64 = SCons.Util.Split("""
+    x86_64-w64-mingw32-
     amd64-mingw32-
     amd64-mingw32msvc-
     amd64-pc-mingw32-
-    x86_64-w64-mingw32-
 """)
 
 def find(env):
@@ -221,17 +221,11 @@ def generate(env):
     env['LIBPREFIXES']    = [ 'lib', '' ]
     env['LIBSUFFIXES']    = [ '.a', '.lib' ]
 
-    # MinGW port of gdb does not handle well dwarf debug info which is the
-    # default in recent gcc versions
-    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'])
+    # MinGW x86 port of gdb does not handle well dwarf debug info which is the
+    # default in recent gcc versions.  The x64 port gdb from mingw-w64 seems to
+    # handle it fine though, so stick with the default there.
+    if env['machine'] != 'x86_64':
+        env.AppendUnique(CCFLAGS = ['-gstabs'])
 
     env.AddMethod(compile_without_gstabs, 'compile_without_gstabs')