Mesa (master): clover/meson: Ignore 'svn' suffix when computing CLANG_RESOURCE_DIR

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: ba55cb2bcd40a71fcdaecff397bceebd8a62a60b
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=ba55cb2bcd40a71fcdaecff397bceebd8a62a60b

Author: Pierre Moreau <pierre.morrow at free.fr>
Date:   Mon Jan  7 21:30:17 2019 +0100

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 at free.fr>
Reviewed-by: Dylan Baker <dylan at pnwbakers.com>

---

 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 a6729af2fb..62ac5f5278 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],