summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorruki <[email protected]>2023-05-04 00:47:43 +0800
committerruki <[email protected]>2023-05-04 00:47:43 +0800
commitbd8a03bfbf9ba0fdc41ac78632c964c76542a4f9 (patch)
tree9057387db8cf2900bb8d0746fee0c8f921b9a0cc
parent9845532d5af458ca89cad94a66434a269c476976 (diff)
fix 7z extractor
-rw-r--r--xmake/modules/utils/archive/extract.lua5
1 files changed, 3 insertions, 2 deletions
diff --git a/xmake/modules/utils/archive/extract.lua b/xmake/modules/utils/archive/extract.lua
index 8a6fbcd02..88ae70707 100644
--- a/xmake/modules/utils/archive/extract.lua
+++ b/xmake/modules/utils/archive/extract.lua
@@ -101,9 +101,10 @@ function _extract_using_7z(archivefile, outputdir, extension, opt)
return false
end
- -- p7zip cannot extract other archive format on msys/cygwin
+ -- p7zip cannot extract other archive format on msys/cygwin, but it can extract .tgz
-- https://github.com/xmake-io/xmake/issues/1575#issuecomment-898205462
- if is_subhost("msys", "cygwin") and extension ~= ".7z" and program:startswith("sh ") then
+ if is_subhost("msys", "cygwin") and program:startswith("sh ") and
+ extension ~= ".7z" and extension ~= ".tgz" then
return false
end