fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-06 13:48:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

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

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

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4511>
(cherry picked from commit a1b69d101a)
This commit is contained in:
Jan Palus 2020-04-10 18:00:40 +02:00 • committed by Eric Engestrom
parent 178156b3e5
commit 906c933e12
2 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -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
},

8
src/gallium/targets/opencl/meson.build
View file

@ -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