From: Jan Palus <atler@pld-linux.org>
Date: Fri, 10 Apr 2020 16:00:40 +0000 (+0200)
Subject: targets/opencl: fix build against LLVM>=10 with Polly support
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=a1b69d101a60974c105df8519890e3f90fd44911;p=mesa.git

targets/opencl: fix build against LLVM>=10 with Polly support

see https://bugs.llvm.org/show_bug.cgi?id=44870

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4511>
---

diff --git a/src/gallium/targets/opencl/meson.build b/src/gallium/targets/opencl/meson.build
index c3029953bb0..dedd8ab7647 100644
--- a/src/gallium/targets/opencl/meson.build
+++ b/src/gallium/targets/opencl/meson.build
@@ -32,6 +32,13 @@ endif
 llvm_libdir = dep_llvm.get_configtool_variable('libdir')
 opencl_libname = with_opencl_icd ? 'MesaOpenCL' : 'OpenCL'
 
+polly_dep = null_dep
+polly_isl_dep = null_dep
+if dep_llvm.version().version_compare('>=10.0.0')
+  polly_dep = cpp.find_library('Polly', dirs : llvm_libdir, required : false)
+  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)
 
 # meson will return clang-cpp from system dirs if it's not found in llvm_libdir
@@ -66,6 +73,7 @@ if not (dep_clang.found() and dep_clang_usable)
     cpp.find_library('clangEdit', dirs : llvm_libdir),
     cpp.find_library('clangLex', dirs : llvm_libdir),
     cpp.find_library('clangBasic', dirs : llvm_libdir),
+    polly_dep, polly_isl_dep,
   ]
   # check clang once more
   if can_check_clang