X-Git-Url: https://git.libre-soc.org/?a=blobdiff_plain;f=scons%2Fcrossmingw.py;h=34129450a56cdf14d8da50242c9c5b7a40a37c5c;hb=293b3e0a3f73ef85b446259dc9422932e0b8ff49;hp=8adc8f5c970be3693f017ba501c6e370d46e69b2;hpb=f816937d77e499b57f011345ce2a5e1c02ef5e91;p=mesa.git

diff --git a/scons/crossmingw.py b/scons/crossmingw.py
index 8adc8f5c970..34129450a56 100644
--- a/scons/crossmingw.py
+++ b/scons/crossmingw.py
@@ -41,24 +41,13 @@ import SCons.Builder
 import SCons.Tool
 import SCons.Util
 
-# This is what we search for to find mingw:
+# These are the mingw toolchain prefixes we search for:
+# (We only search for the mingw-w64 toolchain, and not the mingw.org one.)
 prefixes32 = SCons.Util.Split("""
-    mingw32-
-    mingw32msvc-
-    i386-mingw32-
-    i486-mingw32-
-    i586-mingw32-
-    i686-mingw32-
-    i386-mingw32msvc-
-    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):
@@ -126,6 +115,8 @@ res_builder = SCons.Builder.Builder(action=res_action, suffix='.o',
                                     source_scanner=SCons.Tool.SourceFileScanner)
 SCons.Tool.SourceFileScanner.add_scanner('.rc', SCons.Defaults.CScan)
 
+
+
 def generate(env):
     mingw_prefix = find(env)
 
@@ -183,14 +174,5 @@ 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'])
-
 def exists(env):
     return find(env)