summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorruki <[email protected]>2024-08-30 00:37:29 +0800
committerruki <[email protected]>2024-08-30 00:37:29 +0800
commitb807fd1865272be457b5f8fe97a0411280d1daaf (patch)
tree94842a93618768f858ba2b93aed744344665bfdf
parent87630c8cf33105cc8c000e73cb7b67a2decfe02d (diff)
fix lock packages #5532
-rw-r--r--xmake/modules/private/action/require/impl/install_packages.lua12
1 files changed, 7 insertions, 5 deletions
diff --git a/xmake/modules/private/action/require/impl/install_packages.lua b/xmake/modules/private/action/require/impl/install_packages.lua
index 38e965ca6..eed6fa0b7 100644
--- a/xmake/modules/private/action/require/impl/install_packages.lua
+++ b/xmake/modules/private/action/require/impl/install_packages.lua
@@ -810,9 +810,6 @@ function _install_packages(requires, opt)
if option.get("upgrade") then
_show_upgraded_packages(packages)
end
-
- -- lock packages
- lock_packages(packages)
return packages
end
@@ -822,7 +819,12 @@ function main(requires, opt)
-- and we will check package toolchains before calling package.on_load
--
-- @see https://github.com/xmake-io/xmake/pull/5466
- _install_packages(requires, table.join(opt or {}, {toolchain = true}))
- return _install_packages(requires, opt)
+ local packages = {}
+ table.join2(packages, _install_packages(requires, table.join(opt or {}, {toolchain = true})))
+ table.join2(packages, _install_packages(requires, opt))
+
+ -- lock packages
+ lock_packages(packages)
+ return packages
end