improve check clang

2 files changed, 9 insertions, 10 deletions

diff --git a/xmake/toolchains/clang/check.lua b/xmake/toolchains/clang/check.lua
index 107410a0b..145805547 100644
--- a/xmake/toolchains/clang/check.lua
+++ b/xmake/toolchains/clang/check.lua
@@ -36,7 +36,7 @@ function _check_clang(toolchain, vcvars, suffix)
     return result
 end
 
-function main(toolchain, suffix)
+function _check_for_windows(toolchain, suffix)
 
     -- only for windows or linux (msvc-wine)
     if not is_host("windows", "linux") then
@@ -68,3 +68,10 @@ function main(toolchain, suffix)
     end
 end
 
+function main(toolchain, suffix)
+    if toolchain:is_plat("windows") then
+        return _check_for_windows(toolchain, suffix)
+    end
+    return find_tool("clang", {program = "clang" .. suffix})
+end
+
diff --git a/xmake/toolchains/clang/toolchain_clang.lua b/xmake/toolchains/clang/toolchain_clang.lua
index d18bdf4b6..c73b9d491 100644
--- a/xmake/toolchains/clang/toolchain_clang.lua
+++ b/xmake/toolchains/clang/toolchain_clang.lua
@@ -46,15 +46,7 @@ function toolchain_clang(version)
         end
 
         on_check(function (toolchain)
-            if toolchain:is_plat("windows") then
-                local rootdir = path.join(path.directory(os.scriptdir()), "clang")
-                local result = import("check", {rootdir = rootdir})(toolchain, suffix)
-                if result then
-                    return result
-                end
-            end
-
-            return import("lib.detect.find_tool")("clang", {program = "clang" .. suffix})
+            return import("check")(toolchain, suffix)
         end)
 
         on_load(function (toolchain)