diff options
| author | A2va <[email protected]> | 2024-09-04 10:16:11 +0200 |
|---|---|---|
| committer | A2va <[email protected]> | 2024-09-04 10:16:11 +0200 |
| commit | 124001b3ac745f35631793877b608970831577f6 (patch) | |
| tree | 0df650661e68a79e655e280fcdab8a8c8b192c39 | |
| parent | 567389c2925f8e7de3058ed295699e8b75155925 (diff) | |
Fix confusion between ndk_sdkver and ndkver
| -rw-r--r-- | xmake/toolchains/ndk/load.lua | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/xmake/toolchains/ndk/load.lua b/xmake/toolchains/ndk/load.lua index 9615a68dd..6e702fc9c 100644 --- a/xmake/toolchains/ndk/load.lua +++ b/xmake/toolchains/ndk/load.lua @@ -20,7 +20,6 @@ -- imports import("core.base.hashset") -import("core.base.semver") import("core.project.config") -- get triple @@ -97,7 +96,7 @@ function main(toolchain) -- gnustl and stlport have been removed in ndk r18 (deprecated in ndk r17) -- https://github.com/android/ndk/wiki/Changelog-r18 local old_runtimes = {"gnustl_static", "gnustl_shared", "stlport_static", "stlport_shared"} - if ndk_sdkver and semver.new(format("%s.0.0", ndk_sdkver)):le("18.0.0") then + if ndkver and ndkver < 18 then toolchain:add("runtimes", table.unpack(old_runtimes)) end @@ -221,7 +220,7 @@ function main(toolchain) local cxxstl_sdkdir = nil local ndk_cxxstl = config.get("runtimes") or config.get("ndk_cxxstl") if ndk_cxxstl then - if (ndk_sdkver and semver.new(format("%s.0.0", ndk_sdkver)):ge("18.0.0")) and table.contains(old_runtimes, ndk_cxxstl) then + if (ndkver and ndkver >= 18) and table.contains(old_runtimes, ndk_cxxstl) then utils.warning("%s is was removed in ndk v%s", ndk_cxxstl, ndk_sdkver) end |