OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

clover: Support LLVM coming from CMake instead of config-tool

Browse Source 
Reviewed-by: Karol Herbst <kherbst@redhat.com>
Reviewed-by: Francisco Jerez <currojerez@riseup.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7680>
This commit is contained in:
Jesse Natalie
2020-11-18 18:28:49 -08:00
parent 425cfcafb2
commit 72566fd92c
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/gallium/frontends/clover/meson.build
View File

@@ -71,7 +71,7 @@ libclllvm = static_library(
clover_opencl_cpp_args,
clover_spirv_cpp_args,
'-DCLANG_RESOURCE_DIR="@0@"'.format(join_paths(
dep_llvm.get_configtool_variable('libdir'), 'clang',
dep_llvm.get_variable(cmake : 'LLVM_LIBRARY_DIR', configtool: 'libdir'), 'clang',
dep_llvm.version(), 'include',
)),
],

2
src/gallium/targets/opencl/meson.build
View File

@@ -29,7 +29,7 @@ if with_ld_version_script
opencl_link_deps += files('opencl.sym')
endif
llvm_libdir = dep_llvm.get_configtool_variable('libdir')
llvm_libdir = dep_llvm.get_variable(cmake : 'LLVM_LIBRARY_DIR', configtool: 'libdir')
opencl_libname = with_opencl_icd ? 'MesaOpenCL' : 'OpenCL'
polly_dep = null_dep