Virtualization
/
meson
mirror of https://gitlab.com/qemu-project/meson.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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
This commit is contained in:
Luca Bacci 2020-03-09 11:03:13 +01:00 committed by Nirbheek Chauhan
parent 912d7b7eea
commit 1bd1f98086
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mesonbuild/environment.py
View File

@ -1063,7 +1063,7 @@ class Environment:
m = 'Failed to detect MSVC compiler version: stderr was\n{!r}' m = 'Failed to detect MSVC compiler version: stderr was\n{!r}'
raise EnvironmentException(m.format(err)) raise EnvironmentException(m.format(err))
cl_signature = lookat.split('\n')[0] 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: if match:
target = match.group(1) target = match.group(1)
else: else: