From 487e078ad187eaf6840e09f32782abf1faeda0d7 Mon Sep 17 00:00:00 2001 From: star9029 Date: Sun, 1 Dec 2024 19:00:10 +0800 Subject: Fix meson package build --- xmake/modules/package/tools/meson.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'xmake/modules/package') diff --git a/xmake/modules/package/tools/meson.lua b/xmake/modules/package/tools/meson.lua index 1668d2bfe..503092acc 100644 --- a/xmake/modules/package/tools/meson.lua +++ b/xmake/modules/package/tools/meson.lua @@ -69,7 +69,7 @@ function _translate_flags(package, flags) if package:is_plat("android") then local flags_new = {} for _, flag in ipairs(flags) do - if flag:startswith("-gcc-toolchain ") or flag:startswith("-target ") or flag:startswith("-isystem ") then + if flag:startswith("-gcc-toolchain ") or flag:startswith("--target=") or flag:startswith("-isystem ") then table.join2(flags_new, flag:split(" ", {limit = 2})) else table.insert(flags_new, flag) @@ -173,8 +173,8 @@ function _insert_cross_configs(package, file, opt) file:print("endian = 'little'") elseif package:is_plat("wasm") then file:print("system = 'emscripten'") - file:print("cpu_family = 'wasm32'") - file:print("cpu = 'wasm32'") + file:print("cpu_family = '%s'", package:arch()) + file:print("cpu = '%s'", package:arch()) file:print("endian = 'little'") else local cpu = package:arch() -- cgit v1.3.1