diff options
| author | ruki <[email protected]> | 2024-12-01 22:01:01 +0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2024-12-01 22:01:01 +0800 |
| commit | c1704215e76135a16d6b214904b244c2b7d2b00a (patch) | |
| tree | f83990ff911f10017ab784cdd3f2558fba3633f2 | |
| parent | ee024dc442379d5fae95ea7a0ff0ce0c0331ee97 (diff) | |
| parent | 487e078ad187eaf6840e09f32782abf1faeda0d7 (diff) | |
Merge pull request #5912 from star-hengxing/meson
Fix meson package build
| -rw-r--r-- | xmake/modules/package/tools/meson.lua | 6 | ||||
| -rw-r--r-- | xmake/toolchains/ndk/load.lua | 8 |
2 files changed, 7 insertions, 7 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() diff --git a/xmake/toolchains/ndk/load.lua b/xmake/toolchains/ndk/load.lua index e64b98867..32e5632ff 100644 --- a/xmake/toolchains/ndk/load.lua +++ b/xmake/toolchains/ndk/load.lua @@ -123,10 +123,10 @@ function main(toolchain) -- add ndk target local ndk_target = _get_target(arch, ndk_sdkver) - toolchain:add("cxflags", "-target " .. ndk_target) - toolchain:add("asflags", "-target " .. ndk_target) - toolchain:add("ldflags", "-target " .. ndk_target) - toolchain:add("shflags", "-target " .. ndk_target) + toolchain:add("cxflags", "--target=" .. ndk_target) + toolchain:add("asflags", "--target=" .. ndk_target) + toolchain:add("ldflags", "--target=" .. ndk_target) + toolchain:add("shflags", "--target=" .. ndk_target) -- add gcc toolchain local gcc_toolchain = toolchain:config("gcc_toolchain") |