From 095c2acf0180a1cbe7d60b6ffbfcd14e35724e22 Mon Sep 17 00:00:00 2001 From: Yonggang Luo Date: Fri, 21 Nov 2025 17:48:00 +0800 Subject: [PATCH] meson: do not reconstruct ICD paths This is a follow up of https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/20907/diffs?commit_id=b6a344f4baa1ee2c784ca74499dc9fe3b4519013 Signed-off-by: Yonggang Luo Reviewed-by: Gurchetan Singh Part-of: --- src/asahi/vulkan/meson.build | 4 ++-- src/nouveau/vulkan/meson.build | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/asahi/vulkan/meson.build b/src/asahi/vulkan/meson.build index c501fc6ab1c..7c7e2eb1d0d 100644 --- a/src/asahi/vulkan/meson.build +++ b/src/asahi/vulkan/meson.build @@ -122,7 +122,7 @@ asahi_icd = custom_target( ) _dev_icdname = 'asahi_devenv_icd.@0@.json'.format(host_machine.cpu()) -custom_target( +_dev_icd = custom_target( input : [vk_icd_gen, vk_api_xml], output : _dev_icdname, command : [ @@ -136,4 +136,4 @@ custom_target( build_by_default : true, ) -devenv.append('VK_DRIVER_FILES', meson.current_build_dir() / _dev_icdname) +devenv.append('VK_DRIVER_FILES', _dev_icd.full_path()) diff --git a/src/nouveau/vulkan/meson.build b/src/nouveau/vulkan/meson.build index e3fec2086c6..9ecfa1308a6 100644 --- a/src/nouveau/vulkan/meson.build +++ b/src/nouveau/vulkan/meson.build @@ -180,7 +180,7 @@ nouveau_icd = custom_target( ) _dev_icdname = 'nouveau_devenv_icd.@0@.json'.format(host_machine.cpu()) -custom_target( +_dev_icd = custom_target( 'nouveau_devenv_icd', input : [vk_icd_gen, vk_api_xml], output : _dev_icdname, @@ -195,7 +195,7 @@ custom_target( build_by_default : true, ) -devenv.append('VK_DRIVER_FILES', meson.current_build_dir() / _dev_icdname) +devenv.append('VK_DRIVER_FILES', _dev_icd.full_path()) if with_tests and not with_platform_android test(