summaryrefslogtreecommitdiff
path: root/xmake/rules/utils
diff options
context:
space:
mode:
authorruki <[email protected]>2024-02-05 22:56:00 +0800
committerruki <[email protected]>2024-02-05 11:38:17 +0800
commit4310eaa1a4c0b1459172b4763c0641c62dbba994 (patch)
treef319ad7c1dc9d4df92e7c53d11fc86804e01b6d4 /xmake/rules/utils
parentc434a5f502627324e49935407038065f18464905 (diff)
fix depinherit #4689
Diffstat (limited to 'xmake/rules/utils')
-rw-r--r--xmake/rules/utils/inherit_links/inherit_links.lua5
1 files changed, 2 insertions, 3 deletions
diff --git a/xmake/rules/utils/inherit_links/inherit_links.lua b/xmake/rules/utils/inherit_links/inherit_links.lua
index 4a2c0b969..0b181b265 100644
--- a/xmake/rules/utils/inherit_links/inherit_links.lua
+++ b/xmake/rules/utils/inherit_links/inherit_links.lua
@@ -99,9 +99,8 @@ function main(target)
-- export rpathdirs for all shared library
if targetkind == "binary" then
local targetdir = target:targetdir()
- for _, dep in ipairs(target:orderdeps()) do
- local depinherit = target:extraconf("deps", dep:name(), "inherit")
- if dep:kind() == "shared" and (depinherit == nil or depinherit) then
+ for _, dep in ipairs(target:orderdeps({inherit = true})) do
+ if dep:kind() == "shared" then
local rpathdir = "@loader_path"
local subdir = path.relative(path.directory(dep:targetfile()), targetdir)
if subdir and subdir ~= '.' then