From 993bc3af95819bb9a4354b7da2ddb7cfe196f90b Mon Sep 17 00:00:00 2001 From: Aaron Puchert Date: Wed, 25 Sep 2019 18:34:34 +0000 Subject: [PATCH] Link with clang-cpp instead of Clang component libraries Since LLVM 9, the Clang C++ API is exposed via the new clang-cpp target, and the component libraries need no longer be packaged [1]. [1] https://releases.llvm.org/9.0.0/tools/clang/docs/ReleaseNotes.html#build-system-changes --- src/gallium/targets/opencl/meson.build | 13 +------------ 1 file changed, 1 insertion(+), 12 deletions(-) diff --git a/src/gallium/targets/opencl/meson.build b/src/gallium/targets/opencl/meson.build index 317ad8dab4a..5fc00390b00 100644 --- a/src/gallium/targets/opencl/meson.build +++ b/src/gallium/targets/opencl/meson.build @@ -42,18 +42,7 @@ libopencl = shared_library( link_with : [libpipe_loader_dynamic, libgallium, libmesa_util], dependencies : [ dep_thread, dep_clock, dep_dl, dep_unwind, dep_elf, dep_expat, - cpp.find_library('clangCodeGen', dirs : llvm_libdir), - cpp.find_library('clangFrontendTool', dirs : llvm_libdir), - cpp.find_library('clangFrontend', dirs : llvm_libdir), - cpp.find_library('clangDriver', dirs : llvm_libdir), - cpp.find_library('clangSerialization', dirs : llvm_libdir), - cpp.find_library('clangParse', dirs : llvm_libdir), - cpp.find_library('clangSema', dirs : llvm_libdir), - cpp.find_library('clangAnalysis', dirs : llvm_libdir), - cpp.find_library('clangAST', dirs : llvm_libdir), - cpp.find_library('clangEdit', dirs : llvm_libdir), - cpp.find_library('clangLex', dirs : llvm_libdir), - cpp.find_library('clangBasic', dirs : llvm_libdir), + cpp.find_library('clang-cpp', dirs : llvm_libdir), ], version : '@0@.0.0'.format(opencl_version), install : true, -- 2.23.0