diff options
| author | ruki <[email protected]> | 2024-12-04 23:39:31 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2024-12-04 23:39:31 +0800 |
| commit | d44164f4488399911eec754bab4abeea7ea229f3 (patch) | |
| tree | e0e78407d03bba79ea98a199506443f74e8e740a | |
| parent | 3237e43498d1650426be1df79c63a71a7f5ca266 (diff) | |
improve merge linkname
| -rw-r--r-- | xmake/modules/private/action/require/impl/actions/install.lua | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/xmake/modules/private/action/require/impl/actions/install.lua b/xmake/modules/private/action/require/impl/actions/install.lua index f7df8991e..abc4e9a4c 100644 --- a/xmake/modules/private/action/require/impl/actions/install.lua +++ b/xmake/modules/private/action/require/impl/actions/install.lua @@ -247,8 +247,9 @@ 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(package:name(), "static", {plat = package:plat(), arch = package:arch()})) + target.filename(linkname, "static", {plat = package:plat(), arch = package:arch()})) merge_staticlib(package, libfile_new, libfiles) for _, libfile in ipairs(libfiles) do os.rm(libfile) |
