Something went wrong. Try again.
What happens if I push all of nixpkgs
Something went wrong. Try again.
1.7 kB · 54 lines
12345678910111213141516171819202122232425262728293031323334353637383940414243444546474849505152535455diff --git a/meson.build b/meson.buildindex c150bff74ff..37fa7f0531b 100644--- a/meson.build+++ b/meson.build@@ -1850,7 +1850,7 @@ endif dep_clang = null_dep if with_clc or with_gallium_clover- 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.txtindex 82324617884..4bde97a8568 100644--- a/meson.options+++ b/meson.options@@ -738,3 +738,10 @@ option( 'none', 'dri2' ], )++option(+ 'clang-libdir',+ type : 'string',+ value : '',+ description : 'Locations to search for clang libraries.'+)diff --git a/src/gallium/targets/opencl/meson.build b/src/gallium/targets/opencl/meson.buildindex ab2c83556a8..a59e88e122f 100644--- a/src/gallium/targets/opencl/meson.build+++ b/src/gallium/targets/opencl/meson.build@@ -56,7 +56,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.buildindex 35833dc7423..41a95927cab 100644--- a/src/gallium/targets/rusticl/meson.build+++ b/src/gallium/targets/rusticl/meson.build@@ -63,7 +63,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'), )