diff options
| author | ruki <[email protected]> | 2025-08-21 14:24:34 +0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2025-08-21 14:24:34 +0800 |
| commit | 1b7892509e03542140e7943fea2d5030a5790e25 (patch) | |
| tree | c844dd43077e63a9275794777ed3614bcd21e75a | |
| parent | e20029764c97d2a987025dbd6c5c0eeac91763f6 (diff) | |
| parent | 047384be11d9dd42b3b9c3c45a5deb7a80a4e03b (diff) | |
Merge pull request #6732 from HuiYuanXin13/dev
fix: android ndk rust link-args
| -rw-r--r-- | xmake/toolchains/ndk/load.lua | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/xmake/toolchains/ndk/load.lua b/xmake/toolchains/ndk/load.lua index 22b7aa658..5a3c0ed4d 100644 --- a/xmake/toolchains/ndk/load.lua +++ b/xmake/toolchains/ndk/load.lua @@ -377,8 +377,10 @@ function main(toolchain) table.insert(rcshflags, "-l" .. link) table.insert(rcldflags, "-l" .. link) end - toolchain:add("rcshflags", "-C link-args=\"" .. (table.concat(rcshflags, " "):gsub("%-march=.-%s", "") .. "\"")) - toolchain:add("rcldflags", "-C link-args=\"" .. (table.concat(rcldflags, " "):gsub("%-march=.-%s", "") .. "\"")) + -- fix [[note: clang++: error: no such file or directory: '"-llog']] on windows + -- @note 'link-args=...' should not be 'link-args="..."' + toolchain:set("rcshflags", {"-C", "link-args=" .. (table.concat(rcshflags, " "):gsub("%-march=.-%s", ""))}, {expand = false}) + toolchain:set("rcldflags", {"-C", "link-args=" .. (table.concat(rcldflags, " "):gsub("%-march=.-%s", ""))}, {expand = false}) local sh = toolchain:tool("sh") -- @note we cannot use `config.get("sh")`, because we need to check sh first if sh then toolchain:add("rcshflags", "-C linker=" .. sh) |