From ba55cb2bcd40a71fcdaecff397bceebd8a62a60b Mon Sep 17 00:00:00 2001 From: Pierre Moreau Date: Mon, 7 Jan 2019 21:30:17 +0100 Subject: [PATCH] clover/meson: Ignore 'svn' suffix when computing CLANG_RESOURCE_DIR MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit The version exported by LLVM in its CMake configuration files can include the “svn” suffix when building a development version (for example “8.0.0svn”). However the exported clang headers are still found under “lib/clang/8.0.0/”, without the “svn” suffix. Meson takes care of removing the “svn” suffix from the version when using the dependency’s `version()` method. This processing is already performed in “configure.ac” when using autotools. Signed-off-by: Pierre Moreau Reviewed-by: Dylan Baker --- src/gallium/state_trackers/clover/meson.build | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gallium/state_trackers/clover/meson.build b/src/gallium/state_trackers/clover/meson.build index a6729af2fb8..62ac5f5278d 100644 --- a/src/gallium/state_trackers/clover/meson.build +++ b/src/gallium/state_trackers/clover/meson.build @@ -53,7 +53,7 @@ libclllvm = static_library( '-DLIBCLC_LIBEXECDIR="@0@/"'.format(dep_clc.get_pkgconfig_variable('libexecdir')), '-DCLANG_RESOURCE_DIR="@0@"'.format(join_paths( dep_llvm.get_configtool_variable('libdir'), 'clang', - dep_llvm.get_configtool_variable('version'), 'include', + dep_llvm.version(), 'include', )), ], dependencies : [dep_llvm, dep_elf], -- 2.30.2