From 761194025ffafcfba5d1b11d7adf9a6194355075 Mon Sep 17 00:00:00 2001 From: Yi-Jyun Pan Date: Sun, 23 May 2021 13:11:30 +0800 Subject: [PATCH] meson: luajit: allow to build in ARM64 Meson thought that a ARM64 cpu is aarch64, while luajit only provided a file for "arm64". Since there is no difference but the name between aarch64 and arm64, I choose to bind aarch64 -> arm64. Signed-off-by: Yi-Jyun Pan --- subprojects/packagefiles/luajit/src/host/meson.build | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/subprojects/packagefiles/luajit/src/host/meson.build b/subprojects/packagefiles/luajit/src/host/meson.build index ff74a3c7a..c7b825bb8 100644 --- a/subprojects/packagefiles/luajit/src/host/meson.build +++ b/subprojects/packagefiles/luajit/src/host/meson.build @@ -2,10 +2,13 @@ minilua = executable('minilua', 'minilua.c', dependencies: system_deps, native: true) -if host_machine.cpu_family() == 'x86_64' +cpu_family = host_machine.cpu_family() +if cpu_family == 'x86_64' dynasm_arch = 'x64' +elif cpu_family == 'aarch64' + dynasm_arch = 'arm64' else - dynasm_arch = host_machine.cpu_family() + dynasm_arch = cpu_family endif dynasm_dasc = files('../vm_@0@.dasc'.format(dynasm_arch))