diff options
| author | Ângelo Andrade Cirino <[email protected]> | 2022-01-10 10:23:17 -0300 |
|---|---|---|
| committer | Ângelo Andrade Cirino <[email protected]> | 2022-01-10 10:23:17 -0300 |
| commit | ed0c0c5e0249aa966ea7061b30710abdd0b09d87 (patch) | |
| tree | 2a51c869a3aea1a093ed569e749bdf0465634a6c /xmake/modules/core/tools/ar.lua | |
| parent | 885d00da8caf74aeed758d030b9a1b50d9078e1f (diff) | |
| parent | 2431dd7e6142ff98b55741cfd4de4d2e69f4f8b5 (diff) | |
Merged from upstream/master
Diffstat (limited to 'xmake/modules/core/tools/ar.lua')
| -rw-r--r-- | xmake/modules/core/tools/ar.lua | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/xmake/modules/core/tools/ar.lua b/xmake/modules/core/tools/ar.lua index dc858a19e..0496238b4 100644 --- a/xmake/modules/core/tools/ar.lua +++ b/xmake/modules/core/tools/ar.lua @@ -20,7 +20,7 @@ -- imports import("core.tool.compiler") -import("private.utils.progress") +import("utils.progress") -- init it function init(self) @@ -30,42 +30,26 @@ end -- make the strip flag function strip(self, level) - - -- the maps local maps = { debug = "-S" , all = "-s" } - - -- make it return maps[level] end -- make the link arguments list function linkargv(self, objectfiles, targetkind, targetfile, flags, opt) - - -- check - assert(targetkind == "static") - - -- init arguments 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}) end - - -- make it return self:program(), argv end -- link the library file function link(self, objectfiles, targetkind, targetfile, flags) - - -- check - assert(targetkind == "static", "the target kind: %s is not support for ar", targetkind) - - -- ensure the target directory os.mkdir(path.directory(targetfile)) -- @note remove the previous archived file first to force recreating a new file |
