diff options
| author | ruki <[email protected]> | 2024-01-27 23:47:12 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2024-01-27 23:47:12 +0800 |
| commit | cf61b2b9e164b6655cc4ea9b983dddffaf297372 (patch) | |
| tree | abc4ca6cf6b77ea58a3838b5b797e6ce62b90f6a /xmake/core | |
| parent | 97ebae3c85e8bb7cfef13b02415e4a5798b13234 (diff) | |
fix runtime configs #4477
Diffstat (limited to 'xmake/core')
| -rw-r--r-- | xmake/core/package/package.lua | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/xmake/core/package/package.lua b/xmake/core/package/package.lua index 5f9524019..ff96e0822 100644 --- a/xmake/core/package/package.lua +++ b/xmake/core/package/package.lua @@ -1454,8 +1454,9 @@ function _instance:configs() configs = {} local requireinfo = self:requireinfo() local configs_required = requireinfo and requireinfo.configs or {} + local configs_overrided = requireinfo and requireinfo.configs_overrided or {} for _, name in ipairs(table.wrap(configs_defined)) do - local value = configs_required[name] + local value = configs_overrided[name] or configs_required[name] if value == nil then value = self:extraconf("configs", name, "default") -- support for the deprecated vs_runtime in add_configs @@ -1493,10 +1494,11 @@ function _instance:_configs_for_buildhash() configs = {} local requireinfo = self:requireinfo() local configs_required = requireinfo and requireinfo.configs or {} + local configs_overrided = requireinfo and requireinfo.configs_overrided or {} local ignored_configs_for_buildhash = hashset.from(requireinfo and requireinfo.ignored_configs_for_buildhash or {}) for _, name in ipairs(table.wrap(configs_defined)) do if not ignored_configs_for_buildhash:has(name) then - local value = configs_required[name] + local value = configs_overrided[name] or configs_required[name] if value == nil then value = self:extraconf("configs", name, "default") -- support for the deprecated vs_runtime in add_configs |