From 9b75c1eaef3d8350571468bb53c845bd781429ec Mon Sep 17 00:00:00 2001 From: Prodea Alexandru-Liviu Date: Sat, 5 Oct 2019 08:43:13 +0000 Subject: scons/MSYS2-MinGW-W64: Fix build options defaults Signed-off-by: Prodea Alexandru-Liviu Reviewed-by: Jose Fonseca Cc: When building in a MSYS2 Mingw-w64 environment Mesa3D sets wrong default build options which inevitably lead to build failure. (cherry picked from commit 6309c31fd815285dab4d6e79dcbdd4773350e50f) --- common.py | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'common.py') diff --git a/common.py b/common.py index e2afff9950f..51dba9c3ca0 100644 --- a/common.py +++ b/common.py @@ -17,6 +17,9 @@ import SCons.Script.SConscript host_platform = _platform.system().lower() if host_platform.startswith('cygwin'): host_platform = 'cygwin' +# MSYS2 default platform selection. +if host_platform.startswith('mingw'): + host_platform = 'windows' # Search sys.argv[] for a "platform=foo" argument since we don't have # an 'env' variable at this point. @@ -49,9 +52,18 @@ if 'PROCESSOR_ARCHITECTURE' in os.environ: else: host_machine = _platform.machine() host_machine = _machine_map.get(host_machine, 'generic') +# MSYS2 default machine selection. +if _platform.system().lower().startswith('mingw') and 'MSYSTEM' in os.environ: + if os.environ['MSYSTEM'] == 'MINGW32': + host_machine = 'x86' + if os.environ['MSYSTEM'] == 'MINGW64': + host_machine = 'x86_64' default_machine = host_machine default_toolchain = 'default' +# MSYS2 default toolchain selection. +if _platform.system().lower().startswith('mingw'): + default_toolchain = 'mingw' if target_platform == 'windows' and host_platform != 'windows': default_machine = 'x86' -- cgit v1.2.3