From f03da01fe374b87b5144c77f56ab78cf7c2a2ed3 Mon Sep 17 00:00:00 2001 From: Dylan Baker Date: Wed, 28 Apr 2021 16:14:58 -0700 Subject: [PATCH] meson/vulkan: fix linkage on windows The current approach likley breaks icl and clang-cl, but it seems that the problem isn't even really related to MSVC, but to Meson's Visual Studio backend, as such, let's use link-whole unless we're using a Visual Studio backend. Fixes: 48d31a6280c4de07279435606a5c0524c1787cad ("meson: link vulkan_util with link_whole on mingw") Reviewed-by: Jesse Natalie Acked-by: James Park Part-of: --- src/vulkan/util/meson.build | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/vulkan/util/meson.build b/src/vulkan/util/meson.build index 8b51d076b46..1a3723990bc 100644 --- a/src/vulkan/util/meson.build +++ b/src/vulkan/util/meson.build @@ -125,7 +125,10 @@ idep_vulkan_util_headers = declare_dependency( include_directories : include_directories('.') ) -if cc.get_id() == 'msvc' +# This is likely a bug in the Meson VS backend, as MSVC with ninja works fine. +# See this discussion here: +# https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10506 +if get_option('backend').startswith('vs') idep_vulkan_util = declare_dependency( link_with : libvulkan_util, dependencies : idep_vulkan_util_headers