summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorruki <[email protected]>2024-04-27 21:12:30 +0800
committerruki <[email protected]>2024-04-27 21:12:30 +0800
commitcf9d0bab95e6a7ea6efd20ace92c9aaa2de5d47e (patch)
treeca29bee3ff6c450db7bb7d5b47a86d7e2287f63d
parent72e47f886e55126db39bbdb59264d13bdf5128ed (diff)
revert gcc-ar
-rw-r--r--xmake/toolchains/cross/load.lua5
1 files changed, 2 insertions, 3 deletions
diff --git a/xmake/toolchains/cross/load.lua b/xmake/toolchains/cross/load.lua
index cbcd65130..dc0fd1b12 100644
--- a/xmake/toolchains/cross/load.lua
+++ b/xmake/toolchains/cross/load.lua
@@ -41,9 +41,8 @@ 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")
- -- old gcc need gcc-ar for lto, @see https://github.com/xmake-io/xmake/issues/5015
- toolchain:add("toolset", "gcc-ar", cross .. "gcc-ar", "ar", cross .. "ar")
- toolchain:add("toolset", "gcc-ranlib", cross .. "gcc-ranlib", "ranlib", cross .. "ranlib")
+ toolchain:add("toolset", "ar", cross .. "ar")
+ toolchain:add("toolset", "ranlib", cross .. "ranlib")
toolchain:add("toolset", "strip", cross .. "strip")
-- add bin search library for loading some dependent .dll files windows