diff options
| author | ruki <[email protected]> | 2020-06-29 21:19:51 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2020-06-29 21:19:51 +0800 |
| commit | ec717c42631c3af49ba20116a53a1e460e4ef63c (patch) | |
| tree | 7819701bd88381186cd6cccdec126c4f19c455d9 | |
| parent | d36ba2fe2114dd708226843e3759b56ae0aac4bc (diff) | |
fix inherit links
| -rw-r--r-- | xmake/rules/utils/inherit_links/inherit_links.lua | 3 |
1 files changed, 2 insertions, 1 deletions
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 |