From a1633be145ffc1c43ea119e95345b59a03f418fa Mon Sep 17 00:00:00 2001
From: Zmmfly <shenqhy@qq.com>
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


From be29d8dce774b733fcdac344980a7d03cc1e77ad Mon Sep 17 00:00:00 2001
From: ruki <waruqi@gmail.com>
Date: Sat, 15 Jan 2022 22:22:08 +0800
Subject: Update armar.lua

---
 xmake/modules/core/tools/armar.lua | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/xmake/modules/core/tools/armar.lua b/xmake/modules/core/tools/armar.lua
index 7dce427dd..9449bf4b9 100644
--- a/xmake/modules/core/tools/armar.lua
+++ b/xmake/modules/core/tools/armar.lua
@@ -24,6 +24,20 @@ 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))
@@ -33,9 +47,5 @@ function link(self, objectfiles, targetkind, targetfile, flags)
 
     -- 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