diff options
| author | ruki <[email protected]> | 2021-10-27 22:32:39 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2021-10-27 09:17:20 +0800 |
| commit | da63bca85fe3d05368556056a90498d784c47bae (patch) | |
| tree | 8a402a9185f509561a2534358f87e140234a0499 /xmake/rules | |
| parent | 17b521d9059907d08390b462bcf09bd8075b84b3 (diff) | |
remove ex kind
Diffstat (limited to 'xmake/rules')
| -rw-r--r-- | xmake/rules/utils/merge_archive/merge_archive.lua | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/xmake/rules/utils/merge_archive/merge_archive.lua b/xmake/rules/utils/merge_archive/merge_archive.lua index c98fc6b31..02d572afc 100644 --- a/xmake/rules/utils/merge_archive/merge_archive.lua +++ b/xmake/rules/utils/merge_archive/merge_archive.lua @@ -93,11 +93,12 @@ end -- do extract function _extract(target, libraryfile, objectdir) - local program, toolname = target:tool("ex") + local program, toolname = target:tool("ar") if program and toolname then if toolname:find("ar") then _extract_for_ar(program, libraryfile, objectdir) - elseif toolname == "lib" then + elseif toolname == "link" then + program = program:replace("link.exe", "lib.exe", {plain = true}) _extract_for_msvclib(program, libraryfile, objectdir) end else |