summaryrefslogtreecommitdiff
path: root/src/gallium/targets/opencl
diff options
context:
space:
mode:
authorJan Palus <atler@pld-linux.org>2020-04-10 18:00:40 +0200
committerMarge Bot <eric+marge@anholt.net>2020-05-14 14:43:52 +0000
commita1b69d101a60974c105df8519890e3f90fd44911 (patch)
treeeb175b97a422bfebd3268a618a36adcc92488de0 /src/gallium/targets/opencl
parentb1151cd2ffc821a09130f87c2a266b2bfe7b0822 (diff)
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>
Diffstat (limited to 'src/gallium/targets/opencl')
-rw-r--r--src/gallium/targets/opencl/meson.build8
1 files changed, 8 insertions, 0 deletions
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