diff options
| author | Luca Bacci <luca.bacci982@gmail.com> | 2020-03-09 11:03:13 +0100 |
|---|---|---|
| committer | Nirbheek Chauhan <nirbheek.chauhan@gmail.com> | 2020-03-10 07:50:54 +0000 |
| commit | 1bd1f9808650ab640b189f96ce8e13aa4b39e74f (patch) | |
| tree | 5d30667c25c8cc10045c9a0f7df2ffdfb42fd737 | |
| parent | 912d7b7eea3d7c1f5f1879487690b1dd84c13f74 (diff) | |
| download | meson-1bd1f9808650ab640b189f96ce8e13aa4b39e74f.zip meson-1bd1f9808650ab640b189f96ce8e13aa4b39e74f.tar.gz meson-1bd1f9808650ab640b189f96ce8e13aa4b39e74f.tar.bz2 | |
Improve regular expression for MSVC compiler target arch detection
Did not work for some MSVC output language combinations.
Now should work for every locale / output language.
Fixes issue #6757
| -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 7fda3be..b995a59 100644 --- a/mesonbuild/environment.py +++ b/mesonbuild/environment.py @@ -1063,7 +1063,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('.*(x86|x64|ARM|ARM64)$', cl_signature) + match = re.search('.*(x86|x64|ARM|ARM64)( |$)', cl_signature) if match: target = match.group(1) else: |