diff options
| author | ruki <[email protected]> | 2024-05-11 20:47:33 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2024-05-11 20:47:33 +0800 |
| commit | 2d0f7082ce3346e71445a94d0c492472150b94b7 (patch) | |
| tree | 84d00ad2fa687d0350a5cecc8401ae6d80557ef1 /xmake/toolchains/cross/load.lua | |
| parent | 1924008b1db3bbf3fc6842a2d0afac209979ad5b (diff) | |
improve gcc-ar
Diffstat (limited to 'xmake/toolchains/cross/load.lua')
| -rw-r--r-- | xmake/toolchains/cross/load.lua | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/xmake/toolchains/cross/load.lua b/xmake/toolchains/cross/load.lua index ddc645db3..1aca5e247 100644 --- a/xmake/toolchains/cross/load.lua +++ b/xmake/toolchains/cross/load.lua @@ -36,6 +36,7 @@ function main(toolchain) toolchain:add("toolset", "as", cross .. "gcc", cross .. "clang") toolchain:add("toolset", "ld", cross .. "g++", cross .. "gcc", cross .. "clang++", cross .. "clang") toolchain:add("toolset", "sh", cross .. "g++", cross .. "gcc", cross .. "clang++", cross .. "clang") + toolchain:add("toolset", "ar", cross .. "gcc-ar", cross .. "ar") toolchain:add("toolset", "ranlib", cross .. "gcc-ranlib", cross .. "ranlib") toolchain:add("toolset", "strip", cross .. "strip") @@ -44,18 +45,5 @@ function main(toolchain) if bindir and is_host("windows") then toolchain:add("runenvs", "PATH", bindir) end - - -- add lto_plugin.so path for gcc - -- @see https://github.com/xmake-io/xmake/issues/5015 - -- - -- and we cannot use gcc-ar, @see https://github.com/xmake-io/xmake/issues/5051 - -- - local lto_plugin = toolchain:config("lto_plugin") - if is_host("windows") and lto_plugin then - toolchain:add("arflags", {"--plugin", lto_plugin}, {force = true}) - toolchain:add("toolset", "ar", cross .. "ar") - else - toolchain:add("toolset", "ar", cross .. "gcc-ar", cross .. "ar") - end end |