improve to find_program

1 files changed, 5 insertions, 4 deletions

diff --git a/xmake/modules/lib/detect/features.lua b/xmake/modules/lib/detect/features.lua
index 33be29301..7a00b04b4 100644
--- a/xmake/modules/lib/detect/features.lua
+++ b/xmake/modules/lib/detect/features.lua
@@ -57,16 +57,17 @@ function main(name, opt)
     _g._RESULTS = _g._RESULTS or {}
     local results = _g._RESULTS
 
+    -- @see https://github.com/xmake-io/xmake/issues/4645
+    -- @note avoid detect the same program in the same time leading to deadlock if running in the coroutine (e.g. ccache)
+    scheduler.co_lock(key)
+
     -- get result from the cache first
     local result = results[key]
     if result ~= nil then
+        scheduler.co_unlock(key)
         return result
     end
 
-    -- @see https://github.com/xmake-io/xmake/issues/4645
-    -- @note avoid detect the same program in the same time leading to deadlock if running in the coroutine (e.g. ccache)
-    scheduler.co_lock(key)
-
     -- detect.tools.xxx.features(opt)?
     local features = import("detect.tools." .. tool.name .. ".features", {try = true})
     if features then