diff options
| author | marha <marha@users.sourceforge.net> | 2014-06-08 15:05:49 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2014-06-08 15:05:49 +0200 |
| commit | 71cc8d9b7dc729934a29445cbd6d1f7a6d9ecbec (patch) | |
| tree | ea689cdd51f395980ddc37dc33781635976f3a16 /mesalib/scons/crossmingw.py | |
| parent | aec798fb4dc72d616732d0fa711faffaa8cd7590 (diff) | |
| parent | 2acb86c9b086bdb9a3897db0b93820652e07cb59 (diff) | |
| download | vcxsrv-71cc8d9b7dc729934a29445cbd6d1f7a6d9ecbec.tar.gz vcxsrv-71cc8d9b7dc729934a29445cbd6d1f7a6d9ecbec.tar.bz2 vcxsrv-71cc8d9b7dc729934a29445cbd6d1f7a6d9ecbec.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
apps/xwininfo/xwininfo.c
xorg-server/hw/xwin/glx/indirect.c
Diffstat (limited to 'mesalib/scons/crossmingw.py')
| -rw-r--r-- | mesalib/scons/crossmingw.py | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/mesalib/scons/crossmingw.py b/mesalib/scons/crossmingw.py index 1287e0ec8..34129450a 100644 --- a/mesalib/scons/crossmingw.py +++ b/mesalib/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): |