improve to find_program

1 files changed, 5 insertions, 4 deletions

diff --git a/xmake/modules/lib/detect/has_flags.lua b/xmake/modules/lib/detect/has_flags.lua
index e45a7a5b3..abfae3a57 100644
--- a/xmake/modules/lib/detect/has_flags.lua
+++ b/xmake/modules/lib/detect/has_flags.lua
@@ -80,6 +80,10 @@ function main(name, flags, opt)
               .. (tool.version or "") .. "_" .. (opt.toolkind or "")
               .. "_" .. (opt.flagkind or "") .. "_" .. table.concat(opt.sysflags, " ") .. "_" .. opt.flagskey
 
+    -- @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)
+
     -- attempt to get result from cache first
     local cacheinfo = detectcache:get("lib.detect.has_flags")
     if not cacheinfo then
@@ -90,13 +94,10 @@ function main(name, flags, opt)
     end
     local result = cacheinfo[key]
     if result ~= nil and not opt.force 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)
-
     -- generate all checked flags
     local checkflags = table.join(flags, opt.sysflags)