summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorruki <[email protected]>2024-09-05 22:45:29 +0800
committerruki <[email protected]>2024-09-05 22:45:29 +0800
commit6926dc82b90ee05088694821aa5e829d25d8a3b4 (patch)
treed5cd26d946650a820db98b6d6138b36543399401
parentfe2154b72498d1f2b6fcdbb143f8b794c49b77cc (diff)
improve to select runtimes
-rw-r--r--xmake/modules/private/action/require/impl/package.lua7
1 files changed, 7 insertions, 0 deletions
diff --git a/xmake/modules/private/action/require/impl/package.lua b/xmake/modules/private/action/require/impl/package.lua
index 878a1eaf4..48339fef3 100644
--- a/xmake/modules/private/action/require/impl/package.lua
+++ b/xmake/modules/private/action/require/impl/package.lua
@@ -1011,6 +1011,13 @@ function _load_package(packagename, requireinfo, opt)
-- check package configurations
_check_package_configurations(package)
+ -- we need to check package toolchains before on_load and select runtimes,
+ -- because we will call compiler-specific apis in on_load/on_fetch/find_package ..
+ --
+ -- @see https://github.com/xmake-io/xmake/pull/5466
+ -- https://github.com/xmake-io/xmake/issues/4596#issuecomment-2014528801
+ _check_package_toolchains(package)
+
-- we need to select package runtimes before computing buildhash
-- @see https://github.com/xmake-io/xmake/pull/4630#issuecomment-1910216561
_select_package_runtimes(package)