From cc3a1942dae6444f192fc14a9bf32bd07120fff4 Mon Sep 17 00:00:00 2001 From: ruki Date: Sat, 17 Jul 2021 10:46:04 +0800 Subject: improve to select artifacts --- xmake/modules/private/action/require/impl/package.lua | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/xmake/modules/private/action/require/impl/package.lua b/xmake/modules/private/action/require/impl/package.lua index 3eb47d11f..79a4647d3 100644 --- a/xmake/modules/private/action/require/impl/package.lua +++ b/xmake/modules/private/action/require/impl/package.lua @@ -555,7 +555,13 @@ function _select_artifacts_for_msvc(package, artifacts_manifest) table.insert(artifacts_infos, artifacts_info) end end - table.sort(artifacts_infos, function (a, b) return semver.compare(a.toolset, b.toolset) > 0 end) + table.sort(artifacts_infos, function (a, b) + if a.toolset and b.toolset then + return semver.compare(a.toolset, b.toolset) > 0 + else + return false + end + end) return artifacts_infos[1] else local buildid = package:plat() .. "-" .. package:arch() .. "-" .. msvc_version .. "-" .. package:buildhash() -- cgit v1.3.1