diff --git a/meson.build b/meson.build
index ade6546b0af81..faadf25a44968 100644
--- a/meson.build
+++ b/meson.build
@@ -295,8 +295,7 @@ with_any_broadcom = [
   with_broadcom_vk,
 ].contains(true)
 
-if ['x86_64'].contains(host_machine.cpu_family()) and \
-   get_option('intel-clc') != 'system'
+if get_option('intel-clc') != 'system'
   # Require intel-clc with Anv & Iris (for internal shaders)
   with_intel_clc = get_option('intel-clc') == 'enabled' or \
                    with_intel_vk or with_gallium_iris
@@ -304,9 +303,7 @@ else
   with_intel_clc = false
 endif
 
-with_intel_vk_rt = with_intel_vk and \
-                   get_option('intel-clc') != 'disabled' and \
-                   get_option('intel-rt') != 'disabled'
+with_intel_vk_rt = with_intel_vk and get_option('intel-rt') != 'disabled'
 
 with_any_intel = [
   with_gallium_crocus,
diff --git a/meson_options.txt b/meson_options.txt
index 5311348719bfa..ae419fce5dcd5 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -635,11 +635,11 @@ option(
   'intel-clc',
   type : 'combo',
   deprecated: {'true': 'enabled', 'false': 'disabled'},
-  value : 'disabled',
+  value : 'auto',
   choices : [
-    'enabled', 'disabled', 'system',
+    'enabled', 'system', 'auto'
   ],
-  description : 'Build the intel-clc compiler.'
+  description : 'Build the intel-clc compiler or use a system version.'
 )
 
 option(