summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorruki <[email protected]>2024-04-27 22:19:32 +0800
committerGitHub <[email protected]>2024-04-27 22:19:32 +0800
commit650ae53243aee978d4fc20ea1a4c881e9a3aa308 (patch)
tree5ac7cf662392a739efd2be4530714b578732e787
parentcf9d0bab95e6a7ea6efd20ace92c9aaa2de5d47e (diff)
parent868941d9ad3d288cf6011bc100d14090f48a5dd6 (diff)
Merge pull request #5024 from xmake-io/gccar
add gcc-ar/gcc-ranlib
-rw-r--r--xmake/toolchains/cross/load.lua5
1 files changed, 3 insertions, 2 deletions
diff --git a/xmake/toolchains/cross/load.lua b/xmake/toolchains/cross/load.lua
index dc0fd1b12..285a3a8a0 100644
--- a/xmake/toolchains/cross/load.lua
+++ b/xmake/toolchains/cross/load.lua
@@ -41,8 +41,9 @@ 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 .. "ar")
- toolchain:add("toolset", "ranlib", cross .. "ranlib")
+ -- old gcc need gcc-ar for lto, @see https://github.com/xmake-io/xmake/issues/5015
+ toolchain:add("toolset", "ar", cross .. "gcc-ar", cross .. "ar")
+ toolchain:add("toolset", "ranlib", cross .. "gcc-ranlib", cross .. "ranlib")
toolchain:add("toolset", "strip", cross .. "strip")
-- add bin search library for loading some dependent .dll files windows