From b972ee7125ffebe207bb76b97dd3bff989f194a2 Mon Sep 17 00:00:00 2001 From: Dylan Baker Date: Thu, 20 Jun 2019 10:37:52 -0700 Subject: environment: Fix detection of Microsoft cl.exe with non English locales This uses the fix as suggested in issue 5491, which it also fixes. Fixes #5491 --- mesonbuild/environment.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py index 744d49d..4e2ff92 100644 --- a/mesonbuild/environment.py +++ b/mesonbuild/environment.py @@ -776,7 +776,7 @@ class Environment: else: m = 'Failed to detect MSVC compiler version: stderr was\n{!r}' raise EnvironmentException(m.format(err)) - match = re.search(' for (.*)$', lookat.split('\n')[0]) + match = re.search('.*(x86|x64|ARM|ARM64).*', lookat.split('\n')[0]) if match: target = match.group(1) else: -- cgit v1.1