Skip to content

Commit d2476ab

Browse files
authored
Merge pull request #5539 from xmake-io/lock
fix lock packages #5532
2 parents 5926c45 + b807fd1 commit d2476ab

File tree

1 file changed

+7
-5
lines changed

1 file changed

+7
-5
lines changed

xmake/modules/private/action/require/impl/install_packages.lua

+7-5
Original file line numberDiff line numberDiff line change
@@ -810,9 +810,6 @@ function _install_packages(requires, opt)
810810
if option.get("upgrade") then
811811
_show_upgraded_packages(packages)
812812
end
813-
814-
-- lock packages
815-
lock_packages(packages)
816813
return packages
817814
end
818815

@@ -822,7 +819,12 @@ function main(requires, opt)
822819
-- and we will check package toolchains before calling package.on_load
823820
--
824821
-- @see https://github.com/xmake-io/xmake/pull/5466
825-
_install_packages(requires, table.join(opt or {}, {toolchain = true}))
826-
return _install_packages(requires, opt)
822+
local packages = {}
823+
table.join2(packages, _install_packages(requires, table.join(opt or {}, {toolchain = true})))
824+
table.join2(packages, _install_packages(requires, opt))
825+
826+
-- lock packages
827+
lock_packages(packages)
828+
return packages
827829
end
828830

0 commit comments

Comments
 (0)