File tree 1 file changed +2
-2
lines changed
1 file changed +2
-2
lines changed Original file line number Diff line number Diff line change @@ -97,7 +97,7 @@ function main(toolchain)
97
97
-- gnustl and stlport have been removed in ndk r18 (deprecated in ndk r17)
98
98
-- https://github.com/android/ndk/wiki/Changelog-r18
99
99
local old_runtimes = {" gnustl_static" , " gnustl_shared" , " stlport_static" , " stlport_shared" }
100
- if ndk_sdkver and semver .new (ndk_sdkver ):le (" r18 " ) then
100
+ if ndk_sdkver and semver .new (format ( " %s.0.0 " , ndk_sdkver )) :le (" 18.0.0 " ) then
101
101
toolchain :add (" runtimes" , table.unpack (old_runtimes ))
102
102
end
103
103
@@ -221,7 +221,7 @@ function main(toolchain)
221
221
local cxxstl_sdkdir = nil
222
222
local ndk_cxxstl = config .get (" runtimes" ) or config .get (" ndk_cxxstl" )
223
223
if ndk_cxxstl then
224
- if (ndk_sdkver and semver .new (ndk_sdkver ):ge (" r18 " )) and table .contains (old_runtimes , ndk_cxxstl ) then
224
+ if (ndk_sdkver and semver .new (format ( " %s.0.0 " , ndk_sdkver )) :ge (" 18.0.0 " )) and table .contains (old_runtimes , ndk_cxxstl ) then
225
225
utils .warning (" %s is was removed in ndk v%s" , ndk_cxxstl , ndk_sdkver )
226
226
end
227
227
You can’t perform that action at this time.
0 commit comments