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

clover: Check if the detected clang libraries are usable

Browse Source 
clang-cpp.so is broken in LLVM-9 and doesn't exist in LLVM<9,
however meson will find and try to use system libraries in these cases.

v2: Use helper variable to dedpulicate test code
    Move second test inside the condition to avoid testing good clang-cpp twice
v3: Check for cross compilation
v4: style fixes

Fixes: ff1a3a00cb
Signed-off-by: Jan Vesely <jano.vesely@gmail.com>
Tested-by: Karol Herbst <kherbst@redhat.com>
Acked-by: Karol Herbst <kherbst@redhat.com>
Reviewed-by: Dylan Baker <dylan@pnwbakers.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4457>
This commit is contained in:
Jan Vesely
2020-04-04 14:59:35 -04:00
committed by Marge Bot
parent 839c886b34
commit 8cbeb13704
1 changed files with 27 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -30,11 +30,28 @@ if with_ld_version_script
endif
llvm_libdir = dep_llvm.get_configtool_variable('libdir')
opencl_libname = with_opencl_icd ? 'MesaOpenCL' : 'OpenCL'
dep_clang = cpp.find_library('clang-cpp', dirs : llvm_libdir, required : false)
if not dep_clang.found()
# meson will return clang-cpp from system dirs if it's not found in llvm_libdir
linker_rpath_arg = '-Wl,--rpath=@0@'.format(llvm_libdir)
clang_test_code = '''
#include <clang/Basic/Version.h>
int main (void) {
size_t found_pos = clang::getClangFullVersion().find(CLANG_VERSION_STRING);
return found_pos == ::std::string::npos ? 1 : 0;
}
'''
can_check_clang = (not meson.is_cross_build() or meson.has_exe_wrapper()) and cpp.has_link_argument(linker_rpath_arg)
if can_check_clang
test_run = cpp.run(clang_test_code, name : 'dep-clang-usable',
dependencies : [dep_llvm, dep_clang], args : linker_rpath_arg)
dep_clang_usable = test_run.compiled() and test_run.returncode() == 0
else
dep_clang_usable = true
endif
if not (dep_clang.found() and dep_clang_usable)
dep_clang = [
cpp.find_library('clangCodeGen', dirs : llvm_libdir),
cpp.find_library('clangFrontendTool', dirs : llvm_libdir),
@@ -50,6 +67,14 @@ if not dep_clang.found()
cpp.find_library('clangLex', dirs : llvm_libdir),
cpp.find_library('clangBasic', dirs : llvm_libdir),
]
# check clang once more
if can_check_clang
test_run = cpp.run(clang_test_code, name : 'dep-clang-usable',
dependencies : [dep_llvm, dep_clang], args : linker_rpath_arg)
if not test_run.compiled() or test_run.returncode() != 0
error('No usable clang found!')
endif
endif
endif
libopencl = shared_library(