clover/meson: Ignore 'svn' suffix when computing CLANG_RESOURCE_DIR
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 <pierre.morrow@free.fr> Reviewed-by: Dylan Baker <dylan@pnwbakers.com>
This commit is contained in:

committed by
Dylan Baker

parent
add5a2ec92
commit
ba55cb2bcd
@@ -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],
|
||||
|
Reference in New Issue
Block a user