diff options
| author | Jesse Natalie <jenatali@microsoft.com> | 2020-02-07 14:22:02 -0800 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2020-04-10 16:11:03 +0300 |
| commit | 700cca809b25b5a068d2d6efd5138e8427f48bde (patch) | |
| tree | 6ddc221567db71d704bb829723bbf1be8a750573 /mesonbuild/backend/vs2010backend.py | |
| parent | 1257002d12f3365ab0d3539c83c17779f0039e88 (diff) | |
| download | meson-700cca809b25b5a068d2d6efd5138e8427f48bde.zip meson-700cca809b25b5a068d2d6efd5138e8427f48bde.tar.gz meson-700cca809b25b5a068d2d6efd5138e8427f48bde.tar.bz2 | |
Fixes meson bug to allow arm64 build
Diffstat (limited to 'mesonbuild/backend/vs2010backend.py')
| -rw-r--r-- | mesonbuild/backend/vs2010backend.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/mesonbuild/backend/vs2010backend.py b/mesonbuild/backend/vs2010backend.py index 94ac1c6..f0f8502 100644 --- a/mesonbuild/backend/vs2010backend.py +++ b/mesonbuild/backend/vs2010backend.py @@ -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 |