diff options
| author | Dylan Baker <dylan@pnwbakers.com> | 2019-06-20 10:37:52 -0700 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2019-06-21 15:50:06 +0300 |
| commit | b972ee7125ffebe207bb76b97dd3bff989f194a2 (patch) | |
| tree | 1145da862fb33c92b1b09581e1faf34c166891dc | |
| parent | 1df2f5e9da1750fe68b0a1b9b75d2f6e9170f5ca (diff) | |
| download | meson-b972ee7125ffebe207bb76b97dd3bff989f194a2.zip meson-b972ee7125ffebe207bb76b97dd3bff989f194a2.tar.gz meson-b972ee7125ffebe207bb76b97dd3bff989f194a2.tar.bz2 | |
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
| -rw-r--r-- | mesonbuild/environment.py | 2 |
1 files changed, 1 insertions, 1 deletions
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: |