tjh.dev
1diff --git a/meson.build b/meson.build
2index c150bff74ff..37fa7f0531b 100644
3--- a/meson.build
4+++ b/meson.build
5@@ -1850,7 +1850,7 @@ endif
6
7 dep_clang = null_dep
8 if with_clc or with_gallium_clover
9- llvm_libdir = dep_llvm.get_variable(cmake : 'LLVM_LIBRARY_DIR', configtool: 'libdir')
10+ llvm_libdir = get_option('clang-libdir')
11
12 dep_clang = cpp.find_library('clang-cpp', dirs : llvm_libdir, required : false)
13
14diff --git a/meson_options.txt b/meson_options.txt
15index 82324617884..4bde97a8568 100644
16--- a/meson.options
17+++ b/meson.options
18@@ -738,3 +738,10 @@ option(
19 'none', 'dri2'
20 ],
21 )
22+
23+option(
24+ 'clang-libdir',
25+ type : 'string',
26+ value : '',
27+ description : 'Locations to search for clang libraries.'
28+)
29diff --git a/src/gallium/targets/opencl/meson.build b/src/gallium/targets/opencl/meson.build
30index ab2c83556a8..a59e88e122f 100644
31--- a/src/gallium/targets/opencl/meson.build
32+++ b/src/gallium/targets/opencl/meson.build
33@@ -56,7 +56,7 @@ if with_opencl_icd
34 configuration : _config,
35 input : 'mesa.icd.in',
36 output : 'mesa.icd',
37- install : true,
38+ install : false,
39 install_tag : 'runtime',
40 install_dir : join_paths(get_option('sysconfdir'), 'OpenCL', 'vendors'),
41 )
42diff --git a/src/gallium/targets/rusticl/meson.build b/src/gallium/targets/rusticl/meson.build
43index 35833dc7423..41a95927cab 100644
44--- a/src/gallium/targets/rusticl/meson.build
45+++ b/src/gallium/targets/rusticl/meson.build
46@@ -63,7 +63,7 @@ configure_file(
47 configuration : _config,
48 input : 'rusticl.icd.in',
49 output : 'rusticl.icd',
50- install : true,
51+ install : false,
52 install_tag : 'runtime',
53 install_dir : join_paths(get_option('sysconfdir'), 'OpenCL', 'vendors'),
54 )