diff options
| author | star9029 <[email protected]> | 2024-12-01 19:00:10 +0800 |
|---|---|---|
| committer | star9029 <[email protected]> | 2024-12-01 19:00:10 +0800 |
| commit | 487e078ad187eaf6840e09f32782abf1faeda0d7 (patch) | |
| tree | f83990ff911f10017ab784cdd3f2558fba3633f2 /xmake/modules | |
| parent | ee024dc442379d5fae95ea7a0ff0ce0c0331ee97 (diff) | |
Fix meson package build
Diffstat (limited to 'xmake/modules')
| -rw-r--r-- | xmake/modules/package/tools/meson.lua | 6 |
1 files changed, 3 insertions, 3 deletions
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() |