summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorruki <[email protected]>2024-07-17 21:01:24 +0800
committerruki <[email protected]>2024-07-17 21:01:24 +0800
commitdf131f5ad79bc1e1da43ef796ce5e398c101059f (patch)
tree2f8a85512cfaa012627fce11863007cf2be1f136
parent61325d912523d963241467a3dc5a2e20fe63ef42 (diff)
enable soname
-rw-r--r--tests/actions/install/xmake.lua2
-rw-r--r--xmake/modules/target/action/install/main.lua2
-rw-r--r--xmake/plugins/pack/batchcmds.lua2
3 files changed, 3 insertions, 3 deletions
diff --git a/tests/actions/install/xmake.lua b/tests/actions/install/xmake.lua
index 18617c971..b12cb5dcd 100644
--- a/tests/actions/install/xmake.lua
+++ b/tests/actions/install/xmake.lua
@@ -1,6 +1,6 @@
add_rules("mode.debug", "mode.release")
---set_version("1.0.1", {soname = true})
+set_version("1.0.1", {soname = true})
add_requires("libplist", {system = false, configs = {shared = true}})
diff --git a/xmake/modules/target/action/install/main.lua b/xmake/modules/target/action/install/main.lua
index aaa99c4f2..f8acc0e81 100644
--- a/xmake/modules/target/action/install/main.lua
+++ b/xmake/modules/target/action/install/main.lua
@@ -141,8 +141,8 @@ function _update_install_rpath(target, opt)
end
local bindir = target:bindir()
local targetfile = path.join(bindir, target:filename())
- rpath_utils.clean(targetfile, {plat = target:plat(), arch = target:arch()})
if target:policy("install.rpath") then
+ rpath_utils.clean(targetfile, {plat = target:plat(), arch = target:arch()})
local result, sources = target:get_from("rpathdirs", "*")
if result and sources then
for idx, rpathdirs in ipairs(result) do
diff --git a/xmake/plugins/pack/batchcmds.lua b/xmake/plugins/pack/batchcmds.lua
index 6245a345c..767f86d75 100644
--- a/xmake/plugins/pack/batchcmds.lua
+++ b/xmake/plugins/pack/batchcmds.lua
@@ -109,8 +109,8 @@ function _update_target_install_rpath(target, batchcmds_, opt)
local package = opt.package
local bindir = _get_target_bindir(package, target)
local targetfile = path.join(bindir, target:filename())
- batchcmds_:clean_rpath(targetfile, {plat = target:plat(), arch = target:arch()})
if target:policy("install.rpath") then
+ batchcmds_:clean_rpath(targetfile, {plat = target:plat(), arch = target:arch()})
local result, sources = target:get_from("rpathdirs", "*")
if result and sources then
for idx, rpathdirs in ipairs(result) do