From fefa020acd7dedbaa99ee18efde58e8b492f9ae1 Mon Sep 17 00:00:00 2001 From: Quentin Schulz Date: Mon, 15 Sep 2025 11:01:30 +0200 Subject: [PATCH] nvk: remove unused relative_dir variable In commit f35172b6a465 ("meson: make CL args common"), the fmacro-prefix-map using relative_dir variable was moved from child meson.build files to the main meson.build file. However, the relative_dir variable assignment from src/nouveau/vulkan/meson.build wasn't removed, while src/asahi/libagx's and src/panfrost/libpan's were. This seems to be an oversight, so let's remove this seemingly now unused relative_dir meson variable from nvk's meson.build. This also allows us to remove the use of discouraged global_build_root() [1] and global_source_root()[2]. [1] https://mesonbuild.com/Reference-manual_builtin_meson.html#mesonglobal_build_root [2] https://mesonbuild.com/Reference-manual_builtin_meson.html#mesonglobal_source_root Fixes: f35172b6a465 ("meson: make CL args common") Signed-off-by: Quentin Schulz Part-of: (cherry picked from commit e1765a2914c0e19a9749177924fc12cd3fd23222) --- .pick_status.json | 2 +- src/nouveau/vulkan/meson.build | 2 -- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index a195e9cf21e..efefc42e73d 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -4184,7 +4184,7 @@ "description": "nvk: remove unused relative_dir variable", "nominated": true, "nomination_type": 2, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": "f35172b6a46558fc628dcc18d41f1a036f93fa1f", "notes": null diff --git a/src/nouveau/vulkan/meson.build b/src/nouveau/vulkan/meson.build index afdaffc9b6f..6e210293ef5 100644 --- a/src/nouveau/vulkan/meson.build +++ b/src/nouveau/vulkan/meson.build @@ -93,8 +93,6 @@ nvk_entrypoints = custom_target( depend_files : vk_entrypoints_gen_depend_files, ) -relative_dir = fs.relative_to(meson.global_source_root(), meson.global_build_root()) - nvkcl_spv = custom_target( input : nvkcl_files, output : 'nvkcl.spv',