Skip to content

Commit

Permalink
environment: Consider MSVC/x64 as native on arm64
Browse files Browse the repository at this point in the history
Just like is already done for MSVS/x86.

We're going to assume Windows >= 11 in this case too, i.e. OS support
for x86 emulation.
  • Loading branch information
oleavr committed Jul 19, 2024
1 parent 18868bd commit 2a65eed
Showing 1 changed file with 2 additions and 0 deletions.
2 changes: 2 additions & 0 deletions mesonbuild/environment.py
Original file line number Diff line number Diff line change
Expand Up @@ -300,6 +300,8 @@ def detect_windows_arch(compilers: CompilersDict) -> str:
for compiler in compilers.values():
if compiler.id == 'msvc' and (compiler.target in {'x86', '80x86'}):
return 'x86'
if compiler.id == 'msvc' and os_arch == 'arm64' and compiler.target == 'x64':
return 'x86_64'
if compiler.id == 'clang-cl' and compiler.target == 'x86':
return 'x86'
if compiler.id == 'gcc' and compiler.has_builtin_define('__i386__'):
Expand Down

0 comments on commit 2a65eed

Please sign in to comment.