From 0b83eee8f989b19e2431413a3242046702aa8367 Mon Sep 17 00:00:00 2001 From: Arthur LAURENT Date: Mon, 12 Jun 2023 14:13:18 +0200 Subject: fix cross file cpu / system / endianess generation when using a custom plat and allow aarch54 arch as a equivalent to arm64 --- xmake/modules/package/tools/meson.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xmake/modules/package/tools/meson.lua b/xmake/modules/package/tools/meson.lua index f1a1c405e..c8029b4dc 100644 --- a/xmake/modules/package/tools/meson.lua +++ b/xmake/modules/package/tools/meson.lua @@ -251,9 +251,9 @@ function _get_cross_file(package, opt) file:print("cpu_family = 'wasm32'") file:print("cpu = 'wasm32'") file:print("endian = 'little'") - elseif package:is_plat("cross") and package:targetos() then + else local cpu = package:arch() - if package:is_arch("arm64") then + if package:is_arch("arm64") or package:is_arch("aarch64") then cpu = "aarch64" elseif package:is_arch("arm.*") then cpu = "arm" -- cgit v1.3.1