From: José Fonseca <jfonseca@vmware.com>
Date: Fri, 6 Jun 2014 12:13:05 +0000 (+0100)
Subject: scons: Search only for mingw-w64 cross-compilers.
X-Git-Tag: android-x86-4.4-r3~5022
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=b6956aef7452954ff986708962cc154c243e0378;p=android-x86%2Fexternal-mesa.git

scons: Search only for mingw-w64 cross-compilers.

Some distros still ship the non-mingw-w64 cross-compilers, but they are
can't build Mesa properly, as Jakob pointed out.
---

diff --git a/scons/crossmingw.py b/scons/crossmingw.py
index 1287e0ec8cc..34129450a56 100644
--- a/scons/crossmingw.py
+++ b/scons/crossmingw.py
@@ -41,26 +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("""
     x86_64-w64-mingw32-
-    amd64-mingw32-
-    amd64-mingw32msvc-
-    amd64-pc-mingw32-
 """)
 
 def find(env):