clc/clover: Link clang statically when shared-llvm is disabled

Makes things easier to handle when aiming for a static build

Cc: mesa-stable
Reviewed-by: Karol Herbst <kherbst@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/18117>

diff --git a/meson.build b/meson.build
index 7247c32..ff26001 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -1884,7 +1884,7 @@ if with_clc
 
   dep_clang = cpp.find_library('clang-cpp', dirs : llvm_libdir, required : false)
 
-  if not dep_clang.found()
+  if not dep_clang.found() or not _shared_llvm
     clang_modules = [
       'clangBasic', 'clangAST', 'clangCodeGen', 'clangLex',
       'clangDriver', 'clangFrontend', 'clangFrontendTool',

diff --git a/src/gallium/targets/opencl/meson.build b/src/gallium/targets/opencl/meson.build
index 14df6b8..8f9d7ac 100644 (file)
--- a/src/gallium/targets/opencl/meson.build
+++ b/src/gallium/targets/opencl/meson.build
@@ -58,7 +58,7 @@ if can_check_clang
 else
   dep_clang_usable = true
 endif
-if not (dep_clang.found() and dep_clang_usable)
+if not _shared_llvm or not (dep_clang.found() and dep_clang_usable)
   dep_clang = [
     cpp.find_library('clangCodeGen', dirs : llvm_libdir),
     cpp.find_library('clangFrontendTool', dirs : llvm_libdir),