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