summaryrefslogtreecommitdiff
path: root/xmake/modules/detect
diff options
context:
space:
mode:
authorruki <[email protected]>2021-08-11 00:37:48 +0800
committerruki <[email protected]>2021-08-11 00:37:48 +0800
commit4c42d820fb5a29f2a935557bddb39830f8676c14 (patch)
tree5e63bfc3049cc1b266ea73413b7d76b5caacacb7 /xmake/modules/detect
parent19dced6cce6982590d18250bfd876dc8691c0ddb (diff)
improve find 7z for mingw/msys
Diffstat (limited to 'xmake/modules/detect')
-rw-r--r--xmake/modules/detect/tools/find_7z.lua5
1 files changed, 5 insertions, 0 deletions
diff --git a/xmake/modules/detect/tools/find_7z.lua b/xmake/modules/detect/tools/find_7z.lua
index b441c2200..ce1a04f4a 100644
--- a/xmake/modules/detect/tools/find_7z.lua
+++ b/xmake/modules/detect/tools/find_7z.lua
@@ -55,6 +55,11 @@ function main(opt)
program = find_program("7za", opt)
end
+ -- find it from msys/mingw, it is only a shell script
+ if not program and is_subhost("msys") then
+ program = find_program("sh 7z", opt)
+ end
+
-- find program version
local version = nil
if program and opt and opt.version then