diff options
| author | ruki <[email protected]> | 2025-01-27 22:28:41 +0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2025-01-27 22:28:41 +0800 |
| commit | db69821b735f01169729c278e409ed2ab81d0b92 (patch) | |
| tree | 845350ad694704bde83bbbb34ec42a2e46854d23 | |
| parent | 897c5ab091733ff963fab2e1f2ce30687cd6d44c (diff) | |
| parent | d600433e0064db699511719b63550459e71d4f0c (diff) | |
Merge pull request #6122 from star-hengxing/clang
Fix clang flag
| -rw-r--r-- | xmake/modules/package/tools/meson.lua | 2 | ||||
| -rw-r--r-- | xmake/toolchains/ndk/load.lua | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/xmake/modules/package/tools/meson.lua b/xmake/modules/package/tools/meson.lua index 503092acc..a9876fe6b 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) diff --git a/xmake/toolchains/ndk/load.lua b/xmake/toolchains/ndk/load.lua index 32e5632ff..032966e5b 100644 --- a/xmake/toolchains/ndk/load.lua +++ b/xmake/toolchains/ndk/load.lua @@ -131,10 +131,10 @@ function main(toolchain) -- add gcc toolchain local gcc_toolchain = toolchain:config("gcc_toolchain") if gcc_toolchain then - toolchain:add("cxflags", "-gcc-toolchain " .. gcc_toolchain) - toolchain:add("asflags", "-gcc-toolchain " .. gcc_toolchain) - toolchain:add("ldflags", "-gcc-toolchain " .. gcc_toolchain) - toolchain:add("shflags", "-gcc-toolchain " .. gcc_toolchain) + toolchain:add("cxflags", "--gcc-toolchain=" .. gcc_toolchain) + toolchain:add("asflags", "--gcc-toolchain=" .. gcc_toolchain) + toolchain:add("ldflags", "--gcc-toolchain=" .. gcc_toolchain) + toolchain:add("shflags", "--gcc-toolchain=" .. gcc_toolchain) end else local march = arch |