summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorruki <[email protected]>2020-05-16 21:45:11 +0800
committerruki <[email protected]>2020-05-16 21:45:16 +0800
commit3e1175f04cf35ae186e0c930bdce7aa467bab818 (patch)
treeba05f4625b068691b9b4b15b1139da7a6e5e2ca6
parented247a74689d45a4cf9a8a8e4aee64dba741df43 (diff)
fix some toolchain bugs
-rw-r--r--xmake/core/tool/toolchain.lua4
1 files changed, 2 insertions, 2 deletions
diff --git a/xmake/core/tool/toolchain.lua b/xmake/core/tool/toolchain.lua
index 6ebae5152..8a62afd8d 100644
--- a/xmake/core/tool/toolchain.lua
+++ b/xmake/core/tool/toolchain.lua
@@ -88,7 +88,7 @@ end
function _instance:tool(toolkind)
local toolpathes = self:get("toolsets." .. toolkind)
if toolpathes then
- for _, toolpath in ipairs(toolpathes) do
+ for _, toolpath in ipairs(table.wrap(toolpathes)) do
local program, toolname = self:_checktool(toolkind, toolpath)
if program then
return program, toolname
@@ -144,7 +144,7 @@ function _instance:_description(toolkind)
}
self._DESCRIPTIONS = descriptions
end
- return descriptions
+ return descriptions[toolkind]
end
-- check the given tool path