diff options
| author | ruki <[email protected]> | 2024-09-04 23:20:31 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2024-09-04 23:20:31 +0800 |
| commit | ed170fa493a32a677474a67ded9aa4b8cda7e1fc (patch) | |
| tree | 8b668205dd2850e3f1a7041f02c33c8b2901e59d | |
| parent | a54fed5d813568e6487ce7187969512e09679afe (diff) | |
fix requirekey for runtimes #5538
| -rw-r--r-- | xmake/modules/private/action/require/impl/package.lua | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/xmake/modules/private/action/require/impl/package.lua b/xmake/modules/private/action/require/impl/package.lua index 0eb2b917c..878a1eaf4 100644 --- a/xmake/modules/private/action/require/impl/package.lua +++ b/xmake/modules/private/action/require/impl/package.lua @@ -587,20 +587,19 @@ function _finish_requireinfo(requireinfo, package) package:arch_set(requireinfo.arch) end requireinfo.configs = requireinfo.configs or {} - if not package:is_headeronly() then - if package:is_plat("windows") then - -- @see https://github.com/xmake-io/xmake/issues/4477#issuecomment-1913249489 - local runtimes = requireinfo.configs.runtimes - if runtimes then - runtimes = runtimes:split(",") - else - runtimes = {} - end - if not table.contains(runtimes, "MT", "MD", "MTd", "MDd") then - table.insert(runtimes, "MT") - end - requireinfo.configs.runtimes = table.concat(runtimes, ",") + if package:is_plat("windows") then + -- @see https://github.com/xmake-io/xmake/issues/4477#issuecomment-1913249489 + -- @note its buildhash will be ignored for headeronly + local runtimes = requireinfo.configs.runtimes + if runtimes then + runtimes = runtimes:split(",") + else + runtimes = {} + end + if not table.contains(runtimes, "MT", "MD", "MTd", "MDd") then + table.insert(runtimes, "MT") end + requireinfo.configs.runtimes = table.concat(runtimes, ",") end -- we need to ensure readonly configs for _, name in ipairs(table.keys(requireinfo.configs)) do |