Mesa (staging/19.0): meson: Force the use of config-tool for llvm

[GitLab Mirror]

Module: Mesa
Branch: staging/19.0
Commit: 1281a2207c63cc8be3c2f15129e9a5aab4b269f9
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=1281a2207c63cc8be3c2f15129e9a5aab4b269f9

Author: Dylan Baker <dylan at pnwbakers.com>
Date:   Tue May  7 09:55:38 2019 -0700

meson: Force the use of config-tool for llvm

meson git now has a cmake find method for llvm, but it lacks a couple of
features that we use from the config tool version. Until that reaches
parity we need to use the config-tool version.

CC: 19.0 19.1 <<mesa-stable at lists.freedesktop.org>
Reviewed-by: Eric Engestrom <eric.engestrom at intel.com>
(cherry picked from commit 0d59459432cf077d768164091318af8fb1612500)

---

 meson.build | 1 +
 1 file changed, 1 insertion(+)

diff --git a/meson.build b/meson.build
index 0d0013fbab5..5286b91c615 100644
--- a/meson.build
+++ b/meson.build
@@ -1213,6 +1213,7 @@ if _llvm != 'false'
       with_gallium_opencl or _llvm == 'true'
     ),
     static : not _shared_llvm,
+    method : 'config-tool',
   )
   with_llvm = dep_llvm.found()
 endif