Merge pull request #1979 from Zmmfly/dev

fix armar error when too many file.

1 files changed, 25 insertions, 0 deletions

diff --git a/xmake/modules/core/tools/armar.lua b/xmake/modules/core/tools/armar.lua
index 66740c11a..9449bf4b9 100644
--- a/xmake/modules/core/tools/armar.lua
+++ b/xmake/modules/core/tools/armar.lua
@@ -24,3 +24,28 @@ function init(self)
     _super.init(self)
 end
 
+-- make the link arguments list
+function linkargv(self, objectfiles, targetkind, targetfile, flags, opt)
+    opt = opt or {}
+    local argv = table.join(flags, targetfile, objectfiles)
+    if is_host("windows") and not opt.rawargs then
+        argv = winos.cmdargv(argv, {escape = true})
+        if #argv > 0 and argv[1] and argv[1]:startswith("@") then
+            argv[1] = argv[1]:replace("@", "", {plain = true})
+            table.insert(argv, 1, "--via")
+        end
+    end
+    return self:program(), argv
+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)
+    os.runv(program, argv, {envs = self:runenvs()})
+end