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

clc/clover: Link clang statically when shared-llvm is disabled

Browse Source 
Makes things easier to handle when aiming for a static build

Cc: mesa-stable

Reviewed-by: Karol Herbst <kherbst@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/18117>
This commit is contained in:
pal1000
2022-08-17 22:29:21 +03:00
committed by Marge Bot
parent 55f6a2bb51
commit ed2743eae5
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
meson.build
View File

@@ -1884,7 +1884,7 @@ if with_clc
dep_clang = cpp.find_library('clang-cpp', dirs : llvm_libdir, required : false) dep_clang = cpp.find_library('clang-cpp', dirs : llvm_libdir, required : false)
if not dep_clang.found() if not dep_clang.found() or not _shared_llvm
clang_modules = [ clang_modules = [
'clangBasic', 'clangAST', 'clangCodeGen', 'clangLex', 'clangBasic', 'clangAST', 'clangCodeGen', 'clangLex',
'clangDriver', 'clangFrontend', 'clangFrontendTool', 'clangDriver', 'clangFrontend', 'clangFrontendTool',

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

@@ -58,7 +58,7 @@ if can_check_clang
else else
dep_clang_usable = true dep_clang_usable = true
endif endif
if not (dep_clang.found() and dep_clang_usable) if not _shared_llvm or not (dep_clang.found() and dep_clang_usable)
dep_clang = [ dep_clang = [
cpp.find_library('clangCodeGen', dirs : llvm_libdir), cpp.find_library('clangCodeGen', dirs : llvm_libdir),
cpp.find_library('clangFrontendTool', dirs : llvm_libdir), cpp.find_library('clangFrontendTool', dirs : llvm_libdir),