fix check g++ toolchains failed

3 files changed, 7 insertions, 4 deletions

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d1cc84892..ea82b5c1a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -14,6 +14,7 @@
 * Fix api scope leaks bug
 * Fix path bug for windows
 * Fix check function bug
+* Fix check toolchains failed
 
 ## v2.0.1
 
@@ -102,6 +103,7 @@
 ### �Ľ�
 
 * �޸İ�װ��ж�ص�action����
+* ���¹���ģ��
 
 ### Bugs�޸�
 
@@ -110,6 +112,7 @@
 * �޸�api������й¶����
 * �޸���windows�ϵ�һЩ·������
 * �޸����꺯��ʧ������
+* �޸���⹤����ʧ������
 
 ## v2.0.1
 
diff --git a/xmake/core/base/string.lua b/xmake/core/base/string.lua
index b3abe36ec..431577a23 100644
--- a/xmake/core/base/string.lua
+++ b/xmake/core/base/string.lua
@@ -41,12 +41,12 @@ function string:find_last(pattern, plain)
     end
 end
 
--- split string with the given pattern
-function string:split(pattern)
+-- split string with the given characters
+function string:split(chars)
 
     -- split it
     local list = {}
-    self:gsub("[^" .. pattern .."]+", function(v) table.insert(list, v) end )
+    self:gsub("[^" .. chars .."]+", function(v) table.insert(list, v) end )
     return list
 end
 
diff --git a/xmake/core/tool/tool.lua b/xmake/core/tool/tool.lua
index 90110fc71..209673e6e 100644
--- a/xmake/core/tool/tool.lua
+++ b/xmake/core/tool/tool.lua
@@ -77,7 +77,7 @@ function tool._find(root, name)
     name = (name:gsub("%s%-+%w+", " "))
 
     -- get the last name by ' ': xxx xxx toolname
-    local names = name:split("%s+")
+    local names = name:split("%s")
     if #names > 0 then
         name = names[#names]
     end