From ec717c42631c3af49ba20116a53a1e460e4ef63c Mon Sep 17 00:00:00 2001 From: ruki Date: Mon, 29 Jun 2020 21:19:51 +0800 Subject: fix inherit links --- xmake/rules/utils/inherit_links/inherit_links.lua | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/xmake/rules/utils/inherit_links/inherit_links.lua b/xmake/rules/utils/inherit_links/inherit_links.lua index a62c81104..3a8396924 100644 --- a/xmake/rules/utils/inherit_links/inherit_links.lua +++ b/xmake/rules/utils/inherit_links/inherit_links.lua @@ -52,7 +52,8 @@ function main(target) if targetkind == "binary" then local targetdir = target:targetdir() for _, dep in ipairs(target:orderdeps()) do - if dep:targetkind() == "shared" then + local depinherit = target:extraconf("deps", dep:name(), "inherit") + if dep:targetkind() == "shared" and depinherit == nil or depinherit then local rpathdir = "@loader_path" local subdir = path.relative(path.directory(dep:targetfile()), targetdir) if subdir and subdir ~= '.' then -- cgit v1.3.1