From 5d37cfc281eee79dcd19c6b1f934f1d3179a4d26 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dav=C3=AD=C3=B0=20Steinn=20Geirsson?= <david@dsg.is>
Date: Mon, 23 Mar 2026 13:52:04 +0000
Subject: [PATCH] Build fixes for vmsilo

---
 meson.build                             | 2 +-
 meson.options                           | 7 +++++++
 src/gallium/targets/rusticl/meson.build | 2 +-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/meson.build b/meson.build
index 5eaae977f67..368981af557 100644
--- a/meson.build
+++ b/meson.build
@@ -1990,7 +1990,7 @@ endif
 
 dep_clang = null_dep
 if with_clc
-  llvm_libdir = dep_llvm.get_variable(cmake : 'LLVM_LIBRARY_DIR', configtool: 'libdir')
+  llvm_libdir = get_option('clang-libdir')
 
   dep_clang = cpp.find_library('clang-cpp', dirs : llvm_libdir, required : false)
 
diff --git a/meson.options b/meson.options
index 7311f21fc85..928764715bc 100644
--- a/meson.options
+++ b/meson.options
@@ -879,3 +879,10 @@ option(
   value : false,
   description : 'use experimental virtio backend for intel driver',
 )
+
+option(
+  'clang-libdir',
+  type : 'string',
+  value : '',
+  description : 'Locations to search for clang libraries.'
+)
diff --git a/src/gallium/targets/rusticl/meson.build b/src/gallium/targets/rusticl/meson.build
index 2b214adbbf5..7f919397ad5 100644
--- a/src/gallium/targets/rusticl/meson.build
+++ b/src/gallium/targets/rusticl/meson.build
@@ -64,7 +64,7 @@ configure_file(
   configuration : _config,
   input : 'rusticl.icd.in',
   output : 'rusticl.icd',
-  install : true,
+  install : false,
   install_tag : 'runtime',
   install_dir : join_paths(get_option('sysconfdir'), 'OpenCL', 'vendors'),
 )