diff options
| -rw-r--r-- | xmake/toolchains/ndk/load.lua | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/xmake/toolchains/ndk/load.lua b/xmake/toolchains/ndk/load.lua index 913e89d02..bf72eaa87 100644 --- a/xmake/toolchains/ndk/load.lua +++ b/xmake/toolchains/ndk/load.lua @@ -20,6 +20,7 @@ -- imports import("core.base.hashset") +import("core.base.semver") import("core.project.config") -- get triple @@ -96,7 +97,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 < 18 then + if ndk_sdkver and semver.new(ndk_sdkver):le("r18") then toolchain:add("runtimes", tabl.unpack(old_runtimes)) end @@ -220,7 +221,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 >= 18) and table.contains(old_runtimes, ndk_cxxstl) then + if (ndk_sdkver and semver.new(ndk_sdkver):ge("r18")) and table.contains(old_runtimes, ndk_cxxstl) then utils.warning("%s is was removed in ndk v%s", ndk_cxxstl, ndk_sdkver) end |