Merge pull request #2135 from xq114/dev

fix cuda tool finding

1 files changed, 3 insertions, 5 deletions

diff --git a/xmake/modules/private/detect/find_cudatool.lua b/xmake/modules/private/detect/find_cudatool.lua
index b5e211d14..374ff9906 100644
--- a/xmake/modules/private/detect/find_cudatool.lua
+++ b/xmake/modules/private/detect/find_cudatool.lua
@@ -45,15 +45,15 @@ function main(toolname, parse, opt)
     opt       = opt or {}
     opt.parse = opt.parse or parse
 
-    -- always keep consistency with cuda cache 
+    -- always keep consistency with cuda cache
+    local program
     local toolchains = find_cuda()
     if toolchains and toolchains.bindir then
         program = find_program(path.join(toolchains.bindir, opt.program or toolname), opt)
     end
 
     -- not found? attempt to find program only
-    local program = nil
-    if opt.program then
+    if not program then
         program = find_program(opt.program or toolname, opt)
     end
 
@@ -62,7 +62,5 @@ function main(toolname, parse, opt)
     if program and opt.version then
         version = find_programver(program, opt)
     end
-
-    -- ok?
     return program, version
 end