diff options
| -rw-r--r-- | xmake/modules/private/action/require/impl/actions/install.lua | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/xmake/modules/private/action/require/impl/actions/install.lua b/xmake/modules/private/action/require/impl/actions/install.lua index abc4e9a4c..6a58e543a 100644 --- a/xmake/modules/private/action/require/impl/actions/install.lua +++ b/xmake/modules/private/action/require/impl/actions/install.lua @@ -247,12 +247,15 @@ function _merge_staticlibs(package) end if #libfiles > 0 then local linkdir = linkdirs[1] - local linkname = table.wrap(package:get("links"))[1] or package:name() - local libfile_new = path.join(installdir, linkdir, - target.filename(linkname, "static", {plat = package:plat(), arch = package:arch()})) + local opt = {plat = package:plat(), arch = package:arch()} + local libfile_new = path.join(installdir, linkdir, target.filename(package:name(), "static", opt)) + merge_staticlib(package, libfile_new, libfiles) + package:set("links", target.linkname(path.filename(libfile_new), opt)) for _, libfile in ipairs(libfiles) do - os.rm(libfile) + if libfile ~= libfile_new then + os.rm(libfile) + end end end end |