diff options
Diffstat (limited to 'xmake/core/package/package.lua')
| -rw-r--r-- | xmake/core/package/package.lua | 29 |
1 files changed, 16 insertions, 13 deletions
diff --git a/xmake/core/package/package.lua b/xmake/core/package/package.lua index 7438896b7..3ca8c6ed8 100644 --- a/xmake/core/package/package.lua +++ b/xmake/core/package/package.lua @@ -252,6 +252,11 @@ function _instance:orderdeps() return self._ORDERDEPS end +-- get link deps +function _instance:linkdeps() + return self._LINKDEPS +end + -- get parents function _instance:parents() return self._PARENTS @@ -1230,19 +1235,17 @@ function _instance:fetchdeps() return end fetchinfo = table.copy(fetchinfo) -- avoid the cached fetchinfo be modified - local orderdeps = self:orderdeps() - if orderdeps then - local total = #orderdeps - for idx, _ in ipairs(orderdeps) do - local dep = orderdeps[total + 1 - idx] - if dep:is_library() then - local depinfo = dep:fetch() - if depinfo then - for name, values in pairs(depinfo) do - if name ~= "license" and name ~= "version" then - fetchinfo[name] = table.wrap(fetchinfo[name]) - table.join2(fetchinfo[name], values) - end + local linkdeps = self:linkdeps() + if linkdeps then + local total = #linkdeps + for idx, _ in ipairs(linkdeps) do + local dep = linkdeps[total + 1 - idx] + local depinfo = dep:fetch() + if depinfo then + for name, values in pairs(depinfo) do + if name ~= "license" and name ~= "version" then + fetchinfo[name] = table.wrap(fetchinfo[name]) + table.join2(fetchinfo[name], values) end end end |