From a1633be145ffc1c43ea119e95345b59a03f418fa Mon Sep 17 00:00:00 2001 From: Zmmfly Date: Sat, 15 Jan 2022 16:35:51 +0800 Subject: fix armar error when too many file. Fix the bug of passing arguments through file when linkargv uses winos.cmdargv. --- xmake/modules/core/tools/armar.lua | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/xmake/modules/core/tools/armar.lua b/xmake/modules/core/tools/armar.lua index 66740c11a..7dce427dd 100644 --- a/xmake/modules/core/tools/armar.lua +++ b/xmake/modules/core/tools/armar.lua @@ -24,3 +24,18 @@ function init(self) _super.init(self) end +-- link the library file +function link(self, objectfiles, targetkind, targetfile, flags) + os.mkdir(path.directory(targetfile)) + + -- @note remove the previous archived file first to force recreating a new file + os.tryrm(targetfile) + + -- link it + local program, argv = linkargv(self, objectfiles, targetkind, targetfile, flags) + if argv[1]:startswith("@") then + argv[1] = argv[1]:replace("@", "", {plain = true}) + table.insert(argv, 1, "--via") + end + os.runv(program, argv, {envs = self:runenvs()}) +end -- cgit v1.3.1