diff options
| author | ruki <[email protected]> | 2021-03-18 22:54:20 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2021-03-18 22:54:20 +0800 |
| commit | 5f4104bb7c5b188965f30d401762162294764b73 (patch) | |
| tree | fe1886f80091e2f5772d54fe76612343113b4a34 /xmake/modules/private/action/require/impl/install_packages.lua | |
| parent | 60932027d85e9cb499132351b5f080f8d2f572a8 (diff) | |
support ndk package
Diffstat (limited to 'xmake/modules/private/action/require/impl/install_packages.lua')
| -rw-r--r-- | xmake/modules/private/action/require/impl/install_packages.lua | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/xmake/modules/private/action/require/impl/install_packages.lua b/xmake/modules/private/action/require/impl/install_packages.lua index fbedc2bc9..8757de282 100644 --- a/xmake/modules/private/action/require/impl/install_packages.lua +++ b/xmake/modules/private/action/require/impl/install_packages.lua @@ -392,15 +392,13 @@ function _get_package_installdeps(packages) end for _, instance in ipairs(packages) do local deps = {} - if instance:deps() then - deps = table.copy(instance:deps()) + if instance:orderdeps() then + deps = table.copy(instance:orderdeps()) end -- patch toolchain/packages to installdeps, because we need install toolchain package first - if instance:is_toplevel() then - for _, toolchain in ipairs(instance:toolchains()) do - for _, packagename in ipairs(toolchain:config("packages")) do - deps[packagename] = packagesmap[packagename] - end + for _, toolchain in ipairs(instance:toolchains()) do + for _, packagename in ipairs(toolchain:config("packages")) do + table.insert(deps, packagesmap[packagename]) end end installdeps[tostring(instance)] = deps |
