Module: Mesa Branch: main Commit: 5c1a8d3b7744d2ce7e8900d9a03a89462f109270 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=5c1a8d3b7744d2ce7e8900d9a03a89462f109270
Author: Jesse Natalie <[email protected]> Date: Thu Apr 27 10:37:08 2023 -0700 meson: Don't use masm with VS backend Fixes: 77826e83 ("util: Add a copy of BLAKE3 hash library.") Reviewed-by: Tatsuyuki Ishi <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/22740> --- src/util/blake3/meson.build | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/util/blake3/meson.build b/src/util/blake3/meson.build index 26f637ec7e5..6b53daab6b3 100644 --- a/src/util/blake3/meson.build +++ b/src/util/blake3/meson.build @@ -14,7 +14,9 @@ blake3_x86_no_simd_defs = ['-DBLAKE3_NO_SSE2', '-DBLAKE3_NO_SSE41', '-DBLAKE3_NO if cpu_family == 'x86_64' if is_windows if is_msvc - if add_languages('masm', required : false) + # An up-to-date version of Meson, not using the VS backend is needed. + # See https://github.com/mesonbuild/meson/issues/11653 + if meson.backend() == 'ninja' and add_languages('masm', required : false) files_blake3 += ['blake3_sse2_x86-64_windows_msvc.masm', 'blake3_sse41_x86-64_windows_msvc.masm', 'blake3_avx2_x86-64_windows_msvc.masm', 'blake3_avx512_x86-64_windows_msvc.masm'] else blake3_defs += blake3_x86_no_simd_defs @@ -42,4 +44,4 @@ blake3 = static_library( idep_blake3 = declare_dependency( link_with : blake3, -) \ No newline at end of file +)
