diff options
| author | Pierre Moreau <[email protected]> | 2019-01-07 21:30:17 +0100 |
|---|---|---|
| committer | Dylan Baker <[email protected]> | 2019-01-08 08:53:38 -0800 |
| commit | ba55cb2bcd40a71fcdaecff397bceebd8a62a60b (patch) | |
| tree | 99a20cf3a62f30e1016ead58b2a02163bbf350b0 /src/gallium | |
| parent | add5a2ec92f4b3f7ac8353e5986dc04186a7b6da (diff) | |
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 <[email protected]>
Reviewed-by: Dylan Baker <[email protected]>
Diffstat (limited to 'src/gallium')
| -rw-r--r-- | src/gallium/state_trackers/clover/meson.build | 2 |
1 files changed, 1 insertions, 1 deletions
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], |