From 906c933e121ae8fd1fc7afa1e2f9e37b91a25ad7 Mon Sep 17 00:00:00 2001 From: Jan Palus Date: Fri, 10 Apr 2020 18:00:40 +0200 Subject: [PATCH] targets/opencl: fix build against LLVM>=10 with Polly support see https://bugs.llvm.org/show_bug.cgi?id=44870 Part-of: (cherry picked from commit a1b69d101a60974c105df8519890e3f90fd44911) --- .pick_status.json | 2 +- src/gallium/targets/opencl/meson.build | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/.pick_status.json b/.pick_status.json index c6f4143bad4..3c30c787b6b 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -2578,7 +2578,7 @@ "description": "targets/opencl: fix build against LLVM>=10 with Polly support", "nominated": false, "nomination_type": null, - "resolution": 4, + "resolution": 1, "master_sha": null, "because_sha": null }, 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