diff --git a/.pick_status.json b/.pick_status.json
index 9a43ed2cfcc..4900677223a 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -24554,7 +24554,7 @@
         "description": "meson: Ensure that LLVMSPIRVLib is not required for Clover",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "cb588d5d6ee290ff8ea405ff3ee56a51bc1b2145",
         "notes": null
diff --git a/meson.build b/meson.build
index 5006e254492..532d9d908e6 100644
--- a/meson.build
+++ b/meson.build
@@ -1742,7 +1742,7 @@ else
   draw_with_llvm = false
 endif
 
-with_opencl_spirv = (_opencl != 'disabled' and get_option('opencl-spirv')) or with_clc
+with_opencl_spirv = (_opencl != 'disabled' and get_option('opencl-spirv')) or with_intel_clc or with_microsoft_clc or with_gallium_rusticl
 if with_opencl_spirv
   chosen_llvm_version_array = dep_llvm.version().split('.')
   chosen_llvm_version_major = chosen_llvm_version_array[0].to_int()