summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorstar9029 <[email protected]>2024-12-05 16:02:23 +0800
committerstar9029 <[email protected]>2024-12-05 16:02:23 +0800
commite86b6373be89bad102c697a9f22ccc3807d05462 (patch)
tree89e8754ff62089c1e73a3ab286eb915b92d7184b
parentb4017ff0b4e2abb4737c0137d5079b7593c819b8 (diff)
Fix package.merge_staticlibs
-rw-r--r--xmake/modules/private/action/require/impl/actions/install.lua11
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