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