summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorruki <[email protected]>2023-07-14 09:08:29 +0800
committerGitHub <[email protected]>2023-07-14 09:08:29 +0800
commitbbaa5fa3d6d2e7328582219b65486debf7334213 (patch)
tree7b9b2de8a101951a17a179b1bca68d47f5887fd9
parentdcdeea0ef9feb0e601ac7350342504b36a8d99ee (diff)
parent4abf3c141a2cd43a78a96d05604b6d95550569e6 (diff)
Merge pull request #3964 from calebkiage/fix-mingw-extraction-on-windows
Fix tar extraction in mingw windows
-rw-r--r--xmake/core/sandbox/modules/import/lib/detect/find_program.lua2
1 files changed, 1 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 dad9dbdd4..a4e3c2849 100644
--- a/xmake/core/sandbox/modules/import/lib/detect/find_program.lua
+++ b/xmake/core/sandbox/modules/import/lib/detect/find_program.lua
@@ -227,7 +227,7 @@ function sandbox_lib_detect_find_program._find(name, paths, opt)
if envpaths then
table.join2(syspaths, path.splitenv(envpaths))
end]]
- if os.host() ~= "windows" then
+ if os.host() ~= "windows" or os.is_subhost("msys", "cygwin") then
table.insert(syspaths, "/usr/local/bin")
table.insert(syspaths, "/usr/bin")
end