diff --git a/.pick_status.json b/.pick_status.json
index f0dfe4d7164..4e65f8edfc6 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -504,7 +504,7 @@
         "description": "intel/vulkan: Add bvh build dependency",
         "nominated": true,
         "nomination_type": 2,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "41baeb3810a44f1746e05d9556d1951e72527499",
         "notes": null
diff --git a/src/intel/vulkan/bvh/meson.build b/src/intel/vulkan/bvh/meson.build
index 68c0ebb3222..8dbb5281c5b 100644
--- a/src/intel/vulkan/bvh/meson.build
+++ b/src/intel/vulkan/bvh/meson.build
@@ -29,7 +29,6 @@ anv_bvh_includes = files(
   'anv_bvh.h',
 )
 
-bvh_spv = []
 foreach s : bvh_shaders
   command = [
     prog_glslang, '-V', '-I' + vk_bvh_include_dir, '-I' + anv_bvh_include_dir, '--target-env', 'spirv1.5', '-x', '-o', '@OUTPUT@', '@INPUT@'
diff --git a/src/intel/vulkan/meson.build b/src/intel/vulkan/meson.build
index 4dd08297851..62ea7366d75 100644
--- a/src/intel/vulkan/meson.build
+++ b/src/intel/vulkan/meson.build
@@ -37,6 +37,7 @@ idep_anv_headers = declare_dependency(
   include_directories : inc_anv,
 )
 
+bvh_spv = []
 if with_intel_vk_rt
   if with_intel_bvh_grl
     subdir('grl')
@@ -124,7 +125,7 @@ endif
 foreach _gfx_ver : ['90', '110', '120', '125', '200', '300']
   libanv_per_hw_ver_libs += static_library(
     'anv_per_hw_ver@0@'.format(_gfx_ver),
-    [anv_per_hw_ver_files, anv_entrypoints[0]],
+    [anv_per_hw_ver_files, anv_entrypoints[0]] + bvh_spv,
     include_directories : [
       inc_include, inc_src, inc_intel,
     ],