summaryrefslogtreecommitdiff
path: root/xmake/modules
diff options
context:
space:
mode:
authorZmmfly <[email protected]>2022-01-15 16:35:51 +0800
committerGitHub <[email protected]>2022-01-15 16:35:51 +0800
commita1633be145ffc1c43ea119e95345b59a03f418fa (patch)
treed69324906f1498f2359f0c33bfa6c7f42988853e /xmake/modules
parent909b14dd4774e651d778a575a0e99dcfdd22b41b (diff)
fix armar error when too many file.
Fix the bug of passing arguments through file when linkargv uses winos.cmdargv.
Diffstat (limited to 'xmake/modules')
-rw-r--r--xmake/modules/core/tools/armar.lua15
1 files changed, 15 insertions, 0 deletions
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