diff options
| author | ruki <[email protected]> | 2026-02-05 15:14:15 +0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2026-02-05 15:14:15 +0800 |
| commit | be074db5aa346a36529c13e8b58db3600a6f1f32 (patch) | |
| tree | cc3c2d40f20d1948bbbce0cc795510ce8766f7a0 | |
| parent | 1217203dfa19c618b1b3da096fd3eb420f38d071 (diff) | |
| parent | 871d920324f2e4d45c12a9938c20e2ea6b407857 (diff) | |
Merge pull request #7294 from xmake-io/toolchain
fix package toolchain
| -rw-r--r-- | xmake/modules/detect/sdks/find_emsdk.lua | 1 | ||||
| -rw-r--r-- | xmake/modules/private/action/require/impl/package.lua | 3 |
2 files changed, 2 insertions, 2 deletions
diff --git a/xmake/modules/detect/sdks/find_emsdk.lua b/xmake/modules/detect/sdks/find_emsdk.lua index 642e7aeb9..2d7acd4f6 100644 --- a/xmake/modules/detect/sdks/find_emsdk.lua +++ b/xmake/modules/detect/sdks/find_emsdk.lua @@ -100,7 +100,6 @@ function main(sdkdir, opt) if opt.verbose or option.get("verbose") then cprint("checking for emsdk directory ... ${color.success}%s", sdk.sdkdir) end - else if opt.verbose or option.get("verbose") then cprint("checking for emsdk directory ... ${color.nothing}${text.nothing}") diff --git a/xmake/modules/private/action/require/impl/package.lua b/xmake/modules/private/action/require/impl/package.lua index ebd6e34d3..7cd26e55f 100644 --- a/xmake/modules/private/action/require/impl/package.lua +++ b/xmake/modules/private/action/require/impl/package.lua @@ -866,7 +866,8 @@ function _select_package_runtimes(package) local runtimes = package:config("runtimes") if runtimes then local runtimes_supported = hashset.new() - local toolchains = package:toolchains() or platform.load(package:plat(), package:arch()):toolchains() + local toolchains = package:toolchains() or + platform.load(package:plat(), package:arch(), {host = package:is_host()}):toolchains() if toolchains then for _, toolchain_inst in ipairs(toolchains) do if toolchain_inst:is_standalone() and toolchain_inst:get("runtimes") then |