From 714363d4ae7e84818f089db5b4b2829419ef0ff1 Mon Sep 17 00:00:00 2001 From: ruki Date: Sat, 4 Mar 2023 10:37:11 +0800 Subject: improve package plat/arch --- xmake/modules/private/action/require/impl/package.lua | 7 +++++++ 1 file changed, 7 insertions(+) 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 -- cgit v1.3.1