forked from auxolotl/core
67 lines
2.3 KiB
Diff
67 lines
2.3 KiB
Diff
|
diff --git a/meson.build b/meson.build
|
||
|
|
index fbb0b29322d..b4825056449 100644
|
||
|
|
--- a/meson.build
|
||
|
|
+++ b/meson.build
|
||
|
|
@@ -1805,7 +1805,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.txt b/meson_options.txt
|
||
|
|
index e885ba61a8a..591ed957c85 100644
|
||
|
|
--- a/meson_options.txt
|
||
|
|
+++ b/meson_options.txt
|
||
|
|
@@ -23,6 +23,12 @@ option(
|
||
|
|
description : 'the window system EGL assumes for EGL_DEFAULT_DISPLAY',
|
||
|
|
)
|
||
|
|
|
||
|
|
+option(
|
||
|
|
+ 'clang-libdir',
|
||
|
|
+ type : 'string',
|
||
|
|
+ value : '',
|
||
|
|
+ description : 'Locations to search for clang libraries.'
|
||
|
|
+)
|
||
|
|
option(
|
||
|
|
'android-stub',
|
||
|
|
type : 'boolean',
|
||
|
|
diff --git a/src/gallium/targets/opencl/meson.build b/src/gallium/targets/opencl/meson.build
|
||
|
|
index 7c14135898e..74dc6850603 100644
|
||
|
|
--- a/src/gallium/targets/opencl/meson.build
|
||
|
|
+++ b/src/gallium/targets/opencl/meson.build
|
||
|
|
@@ -39,7 +39,8 @@ if dep_llvm.version().version_compare('>=10.0.0')
|
||
|
|
polly_isl_dep = cpp.find_library('PollyISL', dirs : llvm_libdir, required : false)
|
||
|
|
endif
|
||
|
|
|
||
|
|
-dep_clang = cpp.find_library('clang-cpp', dirs : llvm_libdir, required : false)
|
||
|
|
+clang_libdir = get_option('clang-libdir')
|
||
|
|
+dep_clang = cpp.find_library('clang-cpp', dirs : clang_libdir, required : false)
|
||
|
|
|
||
|
|
# meson will return clang-cpp from system dirs if it's not found in llvm_libdir
|
||
|
|
linker_rpath_arg = '-Wl,--rpath=@0@'.format(llvm_libdir)
|
||
|
|
@@ -123,7 +124,7 @@ if with_opencl_icd
|
||
|
|
configuration : _config,
|
||
|
|
input : 'mesa.icd.in',
|
||
|
|
output : 'mesa.icd',
|
||
|
|
- install : true,
|
||
|
|
+ install : false,
|
||
|
|
install_tag : 'runtime',
|
||
|
|
install_dir : join_paths(get_option('sysconfdir'), 'OpenCL', 'vendors'),
|
||
|
|
)
|
||
|
|
diff --git a/src/gallium/targets/rusticl/meson.build b/src/gallium/targets/rusticl/meson.build
|
||
|
|
index b2963fe6dfa..99d6d801b94 100644
|
||
|
|
--- a/src/gallium/targets/rusticl/meson.build
|
||
|
|
+++ b/src/gallium/targets/rusticl/meson.build
|
||
|
|
@@ -76,7 +76,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'),
|
||
|
|
)
|