diff options
| author | ruki <[email protected]> | 2024-02-05 08:49:01 +0800 |
|---|---|---|
| committer | GitHub <[email protected]> | 2024-02-05 08:49:01 +0800 |
| commit | e4e204c9f165215ee755d621386b9a1a36adf279 (patch) | |
| tree | ba1b90f9ddeecd56477a5c25cb84e28a3b781832 | |
| parent | a914429dee256d88902bde6a7058bcaf81d0b629 (diff) | |
| parent | f83c203275ab69cf9119983e98d26a96d52e23d7 (diff) | |
Merge pull request #4694 from Arthapz/fix-packages-runtimes
forward --runtimes to packages on non-windows platforms
| -rw-r--r-- | xmake/modules/package/tools/xmake.lua | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/xmake/modules/package/tools/xmake.lua b/xmake/modules/package/tools/xmake.lua index 0a7dd231a..81736c356 100644 --- a/xmake/modules/package/tools/xmake.lua +++ b/xmake/modules/package/tools/xmake.lua @@ -109,6 +109,10 @@ function _get_configs_for_appleos(package, configs, opt) if appledev then table.insert(configs, "--appledev=" .. appledev) end + local runtimes = package:config("runtimes") + if runtimes then + table.insert(configs, "--runtimes=" .. runtimes) + end _get_configs_for_qt(package, configs, opt) _get_configs_for_vcpkg(package, configs, opt) end @@ -135,6 +139,10 @@ function _get_configs_for_mingw(package, configs, opt) table.insert(configs, "--" .. name .. "=" .. tostring(value)) end end + local runtimes = package:config("runtimes") + if runtimes then + table.insert(configs, "--runtimes=" .. runtimes) + end _get_configs_for_qt(package, configs, opt) _get_configs_for_vcpkg(package, configs, opt) end @@ -151,6 +159,10 @@ function _get_configs_for_generic(package, configs, opt) table.insert(configs, "--" .. name .. "=" .. tostring(value)) end end + local runtimes = package:config("runtimes") + if runtimes then + table.insert(configs, "--runtimes=" .. runtimes) + end _get_configs_for_qt(package, configs, opt) _get_configs_for_vcpkg(package, configs, opt) end @@ -165,6 +177,10 @@ function _get_configs_for_host_toolchain(package, configs, opt) if sdkdir then table.insert(configs, "--sdk=" .. sdkdir) end + local runtimes = package:config("runtimes") + if runtimes then + table.insert(configs, "--runtimes=" .. runtimes) + end local toolchain_name = get_config("toolchain") if toolchain_name then table.insert(configs, "--toolchain=" .. toolchain_name) @@ -187,6 +203,10 @@ function _get_configs_for_cross(package, configs, opt) if sdkdir then table.insert(configs, "--sdk=" .. sdkdir) end + local runtimes = package:config("runtimes") + if runtimes then + table.insert(configs, "--runtimes=" .. runtimes) + end local toolchain_name = get_config("toolchain") if toolchain_name then table.insert(configs, "--toolchain=" .. toolchain_name) |