summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--xmake/core/sandbox/modules/import/lib/detect/find_program.lua8
1 files changed, 7 insertions, 1 deletions
diff --git a/xmake/core/sandbox/modules/import/lib/detect/find_program.lua b/xmake/core/sandbox/modules/import/lib/detect/find_program.lua
index 288a9089e..18abf37a2 100644
--- a/xmake/core/sandbox/modules/import/lib/detect/find_program.lua
+++ b/xmake/core/sandbox/modules/import/lib/detect/find_program.lua
@@ -64,7 +64,13 @@ function sandbox_lib_detect_find_program._do_check(program, opt)
elseif type(opt.check) == "table" then
ok, errors = os.runv(program, opt.check, {envs = opt.envs, shell = opt.shell})
else
- ok, errors = sandbox.load(opt.check, program)
+ local ok_or_errors
+ ok, ok_or_errors = sandbox.load(opt.check, program)
+ if ok then
+ ok = ok_or_errors
+ else
+ errors = ok_or_errors
+ end
end
-- check failed? print verbose error info