From 21090c8d3ecf2982291622c934a16be686fefa38 Mon Sep 17 00:00:00 2001
From: Karol Herbst <kherbst@redhat.com>
Date: Sat, 17 Feb 2024 01:45:07 +0100
Subject: [PATCH] meson: do not pull in clc for clover

Fixes: 01d0d943197 ("meson: Simplify clc expression")
Signed-off-by: Karol Herbst <kherbst@redhat.com>
Acked-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27663>
(cherry picked from commit 815a6647eb1383e9dc704ffcc266d85f3b13338a)
---
 .pick_status.json        | 2 +-
 meson.build              | 3 +--
 src/compiler/meson.build | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/.pick_status.json b/.pick_status.json
index 22f3b56b3d2..2055ad0c764 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -1714,7 +1714,7 @@
         "description": "meson: do not pull in clc for clover",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "01d0d9431977ac25a191c860cb6711f48e6c173f",
         "notes": null
diff --git a/meson.build b/meson.build
index 1c8667a8fce..133fd9a8ca3 100644
--- a/meson.build
+++ b/meson.build
@@ -813,7 +813,6 @@ if _opencl != 'disabled'
     error('The Clover OpenCL state tracker requires rtti')
   endif
 
-  with_clc = true
   with_gallium_opencl = true
   with_opencl_icd = _opencl == 'icd'
 else
@@ -838,7 +837,7 @@ if with_gallium_rusticl
 endif
 
 dep_clc = null_dep
-if with_clc
+if with_gallium_opencl or with_clc
   dep_clc = dependency('libclc')
 endif
 
diff --git a/src/compiler/meson.build b/src/compiler/meson.build
index 1dae56d1b2b..8d73544c6d8 100644
--- a/src/compiler/meson.build
+++ b/src/compiler/meson.build
@@ -79,7 +79,7 @@ subdir('nir')
 
 subdir('spirv')
 
-if with_opencl_spirv
+if with_clc
   subdir('clc')
 endif
 if with_gallium