fix find tool bug

1 files changed, 12 insertions, 3 deletions

diff --git a/xmake/core/tool/tool.lua b/xmake/core/tool/tool.lua
index 94a11f7ef..177df273c 100644
--- a/xmake/core/tool/tool.lua
+++ b/xmake/core/tool/tool.lua
@@ -54,9 +54,6 @@ function tool._match(name, toolname)
     -- match the last word? ok
     if name:find(toolname .. "$") then return 80 end
 
-    -- match the partial word? ok
-    if name:find("%-" .. toolname) then return 60 end
-
     -- contains it? ok
     if name:find(toolname, 1, true) then return 30 end
 
@@ -79,6 +76,18 @@ function tool._find(root, name)
     -- remove arguments: -xxx or --xxx
     name = (name:gsub("%s%-+%w+", " "))
 
+    -- get the last name by ' ': xxx xxx toolname
+    local names = name:split("%s+")
+    if #names > 0 then
+        name = names[#names]
+    end
+
+    -- get the last name by '-': xxx-xxx-toolname
+    local names = name:split("%-")
+    if #names > 0 then
+        name = names[#names]
+    end
+
     -- remove suffix: ".xxx"
     name = (name:gsub("%.%w+", ""))