aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Boberg <[email protected]>2026-02-22 21:03:33 +0100
committerStefan Boberg <[email protected]>2026-02-22 21:03:33 +0100
commitb927d006e8d33fcf8d2f5c1bce6b3c052839d32a (patch)
tree8976523e8920dc1706afc0ef7e2466cdb4370fed
parentupdate .gitignore to exclude .claude/ (diff)
downloadzen-b927d006e8d33fcf8d2f5c1bce6b3c052839d32a.tar.xz
zen-b927d006e8d33fcf8d2f5c1bce6b3c052839d32a.zip
disable msys logic in blake3 to fix Git Bash build issues
-rw-r--r--thirdparty/xmake.lua8
1 files changed, 5 insertions, 3 deletions
diff --git a/thirdparty/xmake.lua b/thirdparty/xmake.lua
index 07605a016..6fead7b50 100644
--- a/thirdparty/xmake.lua
+++ b/thirdparty/xmake.lua
@@ -92,9 +92,11 @@ target("blake3")
end
if is_arch("x86_64", "x64") then
- if is_subhost("msys", "cygwin") then
- add_files("blake3/c/*x86-64_windows_gnu.S")
- elseif is_plat("windows") then
+ -- sbo: this breaks when using MINGW on windows (which is what you get in Git Bash), so just disable it
+ -- if is_subhost("msys", "cygwin") then
+ -- add_files("blake3/c/*x86-64_windows_gnu.S")
+ -- elseif is_plat("windows") then
+ if is_plat("windows") then
add_files("blake3/c/*x86-64_windows_msvc.asm")
else
add_files("blake3/c/*x86-64_unix.S")