diff options
| author | Luca Bacci <luca.bacci982@gmail.com> | 2019-11-29 18:09:17 +0100 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2019-11-30 21:52:58 +0200 |
| commit | 2362bdbbf90fd9f44563f8e45891252164db7bde (patch) | |
| tree | 6cb8a5e5e0e6be06a581e58a6b79d184542de63f /mesonbuild/environment.py | |
| parent | 6cc0ef8c078ec58de0e39603f7cba1865368a848 (diff) | |
| download | meson-2362bdbbf90fd9f44563f8e45891252164db7bde.zip meson-2362bdbbf90fd9f44563f8e45891252164db7bde.tar.gz meson-2362bdbbf90fd9f44563f8e45891252164db7bde.tar.bz2 | |
Fix regular expression for MSVC target arch detection
Make it work regardless of MSVC output language
Fixes #6128
See PR #6265
Diffstat (limited to 'mesonbuild/environment.py')
| -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 0763e7d..d81f34f 100644 --- a/mesonbuild/environment.py +++ b/mesonbuild/environment.py @@ -993,7 +993,7 @@ class Environment: m = 'Failed to detect MSVC compiler version: stderr was\n{!r}' raise EnvironmentException(m.format(err)) cl_signature = lookat.split('\n')[0] - match = re.search(' for .*(x86|x64|ARM|ARM64)$', cl_signature) + match = re.search('.*(x86|x64|ARM|ARM64)$', cl_signature) if match: target = match.group(1) else: |