tjh.dev
1diff --git a/meson.build b/meson.build
2index fbb0b29322d..b4825056449 100644
3--- a/meson.build
4+++ b/meson.build
5@@ -1805,7 +1805,7 @@ endif
6
7 dep_clang = null_dep
8 if with_clc
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 e885ba61a8a..591ed957c85 100644
16--- a/meson_options.txt
17+++ b/meson_options.txt
18@@ -23,6 +23,12 @@ option(
19 description : 'the window system EGL assumes for EGL_DEFAULT_DISPLAY',
20 )
21
22+option(
23+ 'clang-libdir',
24+ type : 'string',
25+ value : '',
26+ description : 'Locations to search for clang libraries.'
27+)
28 option(
29 'android-stub',
30 type : 'boolean',
31diff --git a/src/gallium/targets/opencl/meson.build b/src/gallium/targets/opencl/meson.build
32index 7c14135898e..74dc6850603 100644
33--- a/src/gallium/targets/opencl/meson.build
34+++ b/src/gallium/targets/opencl/meson.build
35@@ -39,7 +39,8 @@ if dep_llvm.version().version_compare('>=10.0.0')
36 polly_isl_dep = cpp.find_library('PollyISL', dirs : llvm_libdir, required : false)
37 endif
38
39-dep_clang = cpp.find_library('clang-cpp', dirs : llvm_libdir, required : false)
40+clang_libdir = get_option('clang-libdir')
41+dep_clang = cpp.find_library('clang-cpp', dirs : clang_libdir, required : false)
42
43 # meson will return clang-cpp from system dirs if it's not found in llvm_libdir
44 linker_rpath_arg = '-Wl,--rpath=@0@'.format(llvm_libdir)
45@@ -123,7 +124,7 @@ if with_opencl_icd
46 configuration : _config,
47 input : 'mesa.icd.in',
48 output : 'mesa.icd',
49- install : true,
50+ install : false,
51 install_tag : 'runtime',
52 install_dir : join_paths(get_option('sysconfdir'), 'OpenCL', 'vendors'),
53 )
54diff --git a/src/gallium/targets/rusticl/meson.build b/src/gallium/targets/rusticl/meson.build
55index b2963fe6dfa..99d6d801b94 100644
56--- a/src/gallium/targets/rusticl/meson.build
57+++ b/src/gallium/targets/rusticl/meson.build
58@@ -76,7 +76,7 @@ configure_file(
59 configuration : _config,
60 input : 'rusticl.icd.in',
61 output : 'rusticl.icd',
62- install : true,
63+ install : false,
64 install_tag : 'runtime',
65 install_dir : join_paths(get_option('sysconfdir'), 'OpenCL', 'vendors'),
66 )