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. This processing is already performed in “configure.ac” when using autotools.
Signed-off-by: Pierre Moreau <[email protected]> --- I am not that familiar with Meson yet and couldn’t found a better way to extract the version numbers from the version string than splitting the version string on the ‘s’ character. 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..1985c7583fb 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.get_configtool_variable('version').split('s')[0], 'include', )), ], dependencies : [dep_llvm, dep_elf], -- 2.20.1 _______________________________________________ mesa-dev mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-dev
