diff options
| -rw-r--r-- | xmake/modules/package/tools/meson.lua | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/xmake/modules/package/tools/meson.lua b/xmake/modules/package/tools/meson.lua index 635ca1a8d..70a616258 100644 --- a/xmake/modules/package/tools/meson.lua +++ b/xmake/modules/package/tools/meson.lua @@ -322,14 +322,13 @@ function _get_configs(package, configs, opt) end -- add cross file - if package:is_cross() then + if package:is_cross() or package:is_plat("mingw") then table.insert(configs, "--cross-file=" .. _get_configs_file(package, opt)) - else if package:config("toolchains") then + elseif package:config("toolchains") then if _is_toolchain_compatible_with_host(package) then table.insert(configs, "--native-file=" .. _get_configs_file(package, opt)) else - opt.cross = true - table.insert(configs, "--cross-file=" .. _get_configs_file(package, opt)) + table.insert(configs, "--cross-file=" .. _get_configs_file(package, table.join2(opt, {cross = true}))) end end |