diff options
| author | ruki <[email protected]> | 2024-04-21 22:14:15 +0800 |
|---|---|---|
| committer | ruki <[email protected]> | 2024-04-21 22:14:15 +0800 |
| commit | 561e7792f3a4965877932f2372138a018de75aea (patch) | |
| tree | 59ca20c12b1abbd49c150aa1282ef9d6e7444f70 | |
| parent | 0ec4f8b72c4c4acdeab62645670198b88efa917f (diff) | |
fix runtimes
| -rw-r--r-- | xmake/modules/package/tools/cmake.lua | 10 | ||||
| -rw-r--r-- | xmake/modules/package/tools/meson.lua | 6 |
2 files changed, 8 insertions, 8 deletions
diff --git a/xmake/modules/package/tools/cmake.lua b/xmake/modules/package/tools/cmake.lua index 063d13cb8..da049389e 100644 --- a/xmake/modules/package/tools/cmake.lua +++ b/xmake/modules/package/tools/cmake.lua @@ -186,7 +186,7 @@ function _get_cxxflags(package, opt) end local runtimes = package:runtimes() if runtimes then - local fake_target = {is_shared = function(_) return false end, + local fake_target = {is_shared = function(_) return false end, sourcekinds = function(_) return "cxx" end} table.join2(result, _map_compflags(fake_target, "cxx", "runtime", runtimes)) end @@ -239,9 +239,9 @@ function _get_ldflags(package, opt) table.join2(result, _map_linkflags(package, "binary", {"cxx"}, "syslink", package:build_getenv("syslinks"))) table.join2(result, _map_linkflags(package, "binary", {"cxx"}, "linkdir", package:build_getenv("linkdirs"))) end - local runtimes = package:config("runtimes") + local runtimes = package:runtimes() if runtimes then - local fake_target = {is_shared = function(_) return false end, + local fake_target = {is_shared = function(_) return false end, sourcekinds = function(_) return "cxx" end} table.join2(result, _map_linkflags(fake_target, "binary", {"cxx"}, "runtime", runtimes)) end @@ -271,9 +271,9 @@ function _get_shflags(package, opt) table.join2(result, _map_linkflags(package, "shared", {"cxx"}, "syslink", package:build_getenv("syslinks"))) table.join2(result, _map_linkflags(package, "shared", {"cxx"}, "linkdir", package:build_getenv("linkdirs"))) end - local runtimes = package:config("runtimes") + local runtimes = package:runtimes() if runtimes then - local fake_target = {is_shared = function(_) return true end, + local fake_target = {is_shared = function(_) return true end, sourcekinds = function(_) return "cxx" end} table.join2(result, _map_linkflags(fake_target, "shared", {"cxx"}, "runtime", runtimes)) end diff --git a/xmake/modules/package/tools/meson.lua b/xmake/modules/package/tools/meson.lua index 6e0c27d7e..2a2b248cf 100644 --- a/xmake/modules/package/tools/meson.lua +++ b/xmake/modules/package/tools/meson.lua @@ -289,11 +289,11 @@ function _get_configs_file(package, opt) -- add runtimes flags for _, runtime in ipairs(package:runtimes()) do if not runtime:startswith("M") then - local fake_target = {is_shared = function(_) return false end, + local fake_target = {is_shared = function(_) return false end, sourcekinds = function(_) return "cxx" end} table.join2(cxxflags, _map_compflags(fake_target, "cxx", "runtime", {runtime})) table.join2(ldflags, _map_linkflags(fake_target, "binary", {"cxx"}, "runtime", {runtime})) - fake_target = {is_shared = function(_) return true end, + fake_target = {is_shared = function(_) return true end, sourcekinds = function(_) return "cxx" end} table.join2(shflags, _map_linkflags(fake_target, "shared", {"cxx"}, "runtime", {runtime})) end @@ -347,7 +347,7 @@ function _get_configs(package, configs, opt) end -- add vs runtimes flags - if package:has_runtime("MT*", "MD*") then + if package:is_plat("windows") then if package:has_runtime("MT") then table.insert(configs, "-Db_vscrt=mt") elseif package:has_runtime("MTd") then |
