summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorstar9029 <[email protected]>2024-12-05 16:11:52 +0800
committerstar9029 <[email protected]>2024-12-05 16:11:52 +0800
commit641fea9b88111c30ec02cb9ba03f1b697bda06f9 (patch)
tree3b70ec3f8445ebde7f41f69bdf926cde52a88da8
parente86b6373be89bad102c697a9f22ccc3807d05462 (diff)
improve linkname
-rw-r--r--xmake/modules/private/action/require/impl/actions/install.lua5
1 files changed, 3 insertions, 2 deletions
diff --git a/xmake/modules/private/action/require/impl/actions/install.lua b/xmake/modules/private/action/require/impl/actions/install.lua
index 6a58e543a..3b7a5e04e 100644
--- a/xmake/modules/private/action/require/impl/actions/install.lua
+++ b/xmake/modules/private/action/require/impl/actions/install.lua
@@ -247,11 +247,12 @@ function _merge_staticlibs(package)
end
if #libfiles > 0 then
local linkdir = linkdirs[1]
+ local linkname = package:name()
local opt = {plat = package:plat(), arch = package:arch()}
- local libfile_new = path.join(installdir, linkdir, target.filename(package:name(), "static", opt))
+ local libfile_new = path.join(installdir, linkdir, target.filename(linkname, "static", opt))
merge_staticlib(package, libfile_new, libfiles)
- package:set("links", target.linkname(path.filename(libfile_new), opt))
+ package:set("links", linkname)
for _, libfile in ipairs(libfiles) do
if libfile ~= libfile_new then
os.rm(libfile)