From: Dylan Baker <dylan@pnwbakers.com>
Date: Tue, 7 May 2019 16:55:38 +0000 (-0700)
Subject: meson: Force the use of config-tool for llvm
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=0d59459432cf077d768164091318af8fb1612500;p=mesa.git

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@lists.freedesktop.org>
Reviewed-by: Eric Engestrom <eric.engestrom@intel.com>
---

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