diff options
author | Tamás Bálint Misius <lbphacker@gmail.com> | 2020-09-11 22:58:05 +0200 |
---|---|---|
committer | Nirbheek Chauhan <nirbheek.chauhan@gmail.com> | 2020-09-13 06:27:57 +0000 |
commit | 9d017a9c159409951be7c2b9bda8f172420d2f69 (patch) | |
tree | 78873d0362c388dbb50184c32d76608438bc485e /mesonbuild/environment.py | |
parent | 416b47c9159a507d4059a9dbdc230f87ed6dbac2 (diff) | |
download | meson-9d017a9c159409951be7c2b9bda8f172420d2f69.zip meson-9d017a9c159409951be7c2b9bda8f172420d2f69.tar.gz meson-9d017a9c159409951be7c2b9bda8f172420d2f69.tar.bz2 |
Improve regexp for MSVC target arch detection again
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 c899de0..97ed23c 100644 --- a/mesonbuild/environment.py +++ b/mesonbuild/environment.py @@ -1311,7 +1311,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(r'.*(x86|x64|ARM|ARM64)([^_A-Za-z0-9]|$)', cl_signature) if match: target = match.group(1) else: |