summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorruki <[email protected]>2023-03-04 10:37:11 +0800
committerruki <[email protected]>2023-03-04 10:37:11 +0800
commit714363d4ae7e84818f089db5b4b2829419ef0ff1 (patch)
tree1d73a57164209eae51656bd6d110557902adae03
parentcb2af111c2e2ea39c6230283356952c83d48f81a (diff)
improve package plat/arch
-rw-r--r--xmake/modules/private/action/require/impl/package.lua7
1 files changed, 7 insertions, 0 deletions
diff --git a/xmake/modules/private/action/require/impl/package.lua b/xmake/modules/private/action/require/impl/package.lua
index 79801d675..4fce86820 100644
--- a/xmake/modules/private/action/require/impl/package.lua
+++ b/xmake/modules/private/action/require/impl/package.lua
@@ -495,6 +495,13 @@ end
-- finish requireinfo
function _finish_requireinfo(requireinfo, package)
+ -- we need to synchronise the plat/arch inherited from the parent package as early as possible
+ if requireinfo.plat then
+ package:plat_set(requireinfo.plat)
+ end
+ if requireinfo.arch then
+ package:arch_set(requireinfo.arch)
+ end
requireinfo.configs = requireinfo.configs or {}
if not package:is_headeronly() then
if requireinfo.configs.vs_runtime == nil and package:is_plat("windows") then