From 3e1175f04cf35ae186e0c930bdce7aa467bab818 Mon Sep 17 00:00:00 2001
From: ruki <waruqi@gmail.com>
Date: Sat, 16 May 2020 21:45:11 +0800
Subject: fix some toolchain bugs

---
 xmake/core/tool/toolchain.lua | 4 ++--
 1 file 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
-- 
cgit v1.3.1