Skip to content

Commit ed170fa

Browse files
committed
fix requirekey for runtimes #5538
1 parent a54fed5 commit ed170fa

File tree

1 file changed

+12
-13
lines changed

1 file changed

+12
-13
lines changed

xmake/modules/private/action/require/impl/package.lua

+12-13
Original file line numberDiff line numberDiff line change
@@ -587,20 +587,19 @@ function _finish_requireinfo(requireinfo, package)
587587
package:arch_set(requireinfo.arch)
588588
end
589589
requireinfo.configs = requireinfo.configs or {}
590-
if not package:is_headeronly() then
591-
if package:is_plat("windows") then
592-
-- @see https://github.com/xmake-io/xmake/issues/4477#issuecomment-1913249489
593-
local runtimes = requireinfo.configs.runtimes
594-
if runtimes then
595-
runtimes = runtimes:split(",")
596-
else
597-
runtimes = {}
598-
end
599-
if not table.contains(runtimes, "MT", "MD", "MTd", "MDd") then
600-
table.insert(runtimes, "MT")
601-
end
602-
requireinfo.configs.runtimes = table.concat(runtimes, ",")
590+
if package:is_plat("windows") then
591+
-- @see https://github.com/xmake-io/xmake/issues/4477#issuecomment-1913249489
592+
-- @note its buildhash will be ignored for headeronly
593+
local runtimes = requireinfo.configs.runtimes
594+
if runtimes then
595+
runtimes = runtimes:split(",")
596+
else
597+
runtimes = {}
598+
end
599+
if not table.contains(runtimes, "MT", "MD", "MTd", "MDd") then
600+
table.insert(runtimes, "MT")
603601
end
602+
requireinfo.configs.runtimes = table.concat(runtimes, ",")
604603
end
605604
-- we need to ensure readonly configs
606605
for _, name in ipairs(table.keys(requireinfo.configs)) do

0 commit comments

Comments
 (0)