fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-01 01:38:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

meson: Don't use masm with VS backend

Browse source 
Fixes: 77826e83 ("util: Add a copy of BLAKE3 hash library.")
Reviewed-by: Tatsuyuki Ishi <ishitatsuyuki@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/22740>
This commit is contained in:
Jesse Natalie 2023-04-27 10:37:08 -07:00 • committed by Marge Bot
parent b7f815117e
commit 5c1a8d3b77
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/util/blake3/meson.build
View file

@ -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,
)
)