summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorArthur LAURENT <[email protected]>2024-04-10 16:01:04 +0200
committerArthur LAURENT <[email protected]>2024-04-10 16:01:26 +0200
commit546dd2ee7ec2a4bae9b8a866300313bad9bb8c7a (patch)
tree29698ae0c51c99ad985c83393ab1035c461fe296
parent5a29f4cd631037145d74ad67227c5486c9a08247 (diff)
use package:runtimes instead of package:config("runtimes")
-rw-r--r--xmake/modules/package/tools/autoconf.lua2
-rw-r--r--xmake/modules/package/tools/cmake.lua3
-rw-r--r--xmake/modules/package/tools/make.lua3
-rw-r--r--xmake/modules/package/tools/meson.lua2
4 files changed, 4 insertions, 6 deletions
diff --git a/xmake/modules/package/tools/autoconf.lua b/xmake/modules/package/tools/autoconf.lua
index 05e968a23..7ffb355e7 100644
--- a/xmake/modules/package/tools/autoconf.lua
+++ b/xmake/modules/package/tools/autoconf.lua
@@ -304,7 +304,7 @@ function buildenvs(package, opt)
table.join2(cxxflags, package:_generate_lto_configs("cxx").cxxflags)
table.join2(ldflags, package:_generate_lto_configs().ldflags)
end
- local runtimes = package:config("runtimes")
+ local runtimes = package:runtimes()
if runtimes then
local fake_target = {is_shared = function(_) return false end,
sourcekinds = function(_) return "cxx" end}
diff --git a/xmake/modules/package/tools/cmake.lua b/xmake/modules/package/tools/cmake.lua
index be01d8867..063d13cb8 100644
--- a/xmake/modules/package/tools/cmake.lua
+++ b/xmake/modules/package/tools/cmake.lua
@@ -184,8 +184,7 @@ function _get_cxxflags(package, opt)
table.join2(result, _map_compflags(package, "cxx", "includedir", package:build_getenv("includedirs")))
table.join2(result, _map_compflags(package, "cxx", "sysincludedir", package:build_getenv("sysincludedirs")))
end
- table.join2(result, _map_compflags(package, "cxx", "runtime", package:config("runtimes")))
- local runtimes = package:config("runtimes")
+ local runtimes = package:runtimes()
if runtimes then
local fake_target = {is_shared = function(_) return false end,
sourcekinds = function(_) return "cxx" end}
diff --git a/xmake/modules/package/tools/make.lua b/xmake/modules/package/tools/make.lua
index a69e738fd..bb7a8124f 100644
--- a/xmake/modules/package/tools/make.lua
+++ b/xmake/modules/package/tools/make.lua
@@ -49,8 +49,7 @@ function buildenvs(package)
local asflags = table.copy(table.wrap(package:config("asflags")))
local ldflags = table.copy(table.wrap(package:config("ldflags")))
local shflags = table.copy(table.wrap(package:config("shflags")))
- local runtimes = package:config("runtimes")
- local runtimes = package:config("runtimes")
+ local runtimes = package:runtimes()
if runtimes then
local fake_target = {is_shared = function(_) return false end,
sourcekinds = function(_) return "cxx" end}
diff --git a/xmake/modules/package/tools/meson.lua b/xmake/modules/package/tools/meson.lua
index f293cf420..5e47deb0c 100644
--- a/xmake/modules/package/tools/meson.lua
+++ b/xmake/modules/package/tools/meson.lua
@@ -269,7 +269,7 @@ function _get_configs_file(package, opt)
table.join2(ldflags, _get_ldflags_from_packagedeps(package, opt))
table.join2(shflags, _get_ldflags_from_packagedeps(package, opt))
-- add runtimes flags
- for _, runtime in ipairs(package:config("runtimes")) do
+ for _, runtime in ipairs(package:runtimes()) do
if not runtime:startswith("M") then
local fake_target = {is_shared = function(_) return false end,
sourcekinds = function(_) return "cxx" end}