diff options
| author | Stefan Boberg <[email protected]> | 2026-02-23 09:54:34 +0100 |
|---|---|---|
| committer | Stefan Boberg <[email protected]> | 2026-02-23 09:54:34 +0100 |
| commit | fe46f3a46101cac153e368f040d1bed02bbf04b6 (patch) | |
| tree | 7dd344537e5e937e70d03d7e2611db5c688b2f9d /thirdparty | |
| parent | add <type_traits> (diff) | |
| parent | disable msys logic in blake3 to fix Git Bash build issues (diff) | |
| download | zen-fe46f3a46101cac153e368f040d1bed02bbf04b6.tar.xz zen-fe46f3a46101cac153e368f040d1bed02bbf04b6.zip | |
Merge remote-tracking branch 'origin/main' into sb/threadpool
Diffstat (limited to 'thirdparty')
| -rw-r--r-- | thirdparty/xmake.lua | 8 |
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") |