From a986aea7f7d04bc6a09cb1e050d807ed0c0f36df Mon Sep 17 00:00:00 2001
From: Matt Coster <matt.coster@imgtec.com>
Date: Thu, 27 Apr 2023 16:21:07 +0100
Subject: [PATCH] pvr: Assorted cleanup

Signed-off-by: Matt Coster <matt.coster@imgtec.com>
Reviewed-by: Frank Binns <frank.binns@imgtec.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/23023>
---
 src/imagination/vulkan/meson.build | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/imagination/vulkan/meson.build b/src/imagination/vulkan/meson.build
index 6c4ce7fa8ed..06d71aba0d4 100644
--- a/src/imagination/vulkan/meson.build
+++ b/src/imagination/vulkan/meson.build
@@ -161,8 +161,7 @@ powervr_mesa_icd = custom_target(
   command : [
     prog_python, '@INPUT0@',
     '--api-version', '1.0', '--xml', '@INPUT1@',
-    '--lib-path', join_paths(get_option('prefix'), get_option('libdir'),
-                             'libvulkan_powervr_mesa.so'),
+    '--lib-path', get_option('prefix') / get_option('libdir') / 'libvulkan_powervr_mesa.so',
     '--out', '@OUTPUT@',
   ],
   build_by_default : true,
@@ -170,11 +169,10 @@ powervr_mesa_icd = custom_target(
   install : true,
 )
 
-_dev_icdname = 'powervr_mesa_devenv_icd.@0@.json'.format(host_machine.cpu())
 _dev_icd = custom_target(
   'powervr_mesa_devenv_icd',
   input : [vk_icd_gen, vk_api_xml],
-  output : _dev_icdname,
+  output : 'powervr_mesa_devenv_icd.@0@.json'.format(host_machine.cpu()),
   command : [
     prog_python, '@INPUT0@',
     '--api-version', '1.0', '--xml', '@INPUT1@',