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

Fixes meson bug to allow arm64 build

This commit is contained in:
Jesse Natalie 2020-02-07 14:22:02 -08:00 committed by Jussi Pakkanen
parent 1257002d12
commit 700cca809b
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
mesonbuild/backend/vs2010backend.py
View File

@ -167,12 +167,14 @@ class Vs2010Backend(backends.Backend):
def generate(self):
target_machine = self.interpreter.builtin['target_machine'].cpu_family_method(None, None)
if target_machine.endswith('64'):
if target_machine == '64' or target_machine == 'x86_64':
# amd64 or x86_64
self.platform = 'x64'
elif target_machine == 'x86':
# x86
self.platform = 'Win32'
elif target_machine == 'aarch64' or target_machine == 'arm64':
self.platform = 'arm64'
elif 'arm' in target_machine.lower():
self.platform = 'ARM'
else:
@ -1185,6 +1187,8 @@ class Vs2010Backend(backends.Backend):
targetmachine.text = 'MachineX64'
elif targetplatform == 'arm':
targetmachine.text = 'MachineARM'
elif targetplatform == 'arm64':
targetmachine.text = 'MachineARM64'
else:
raise MesonException('Unsupported Visual Studio target machine: ' + targetplatform)
# /nologo