meson: Force the use of config-tool for llvm
authorDylan Baker <dylan@pnwbakers.com>
Tue, 7 May 2019 16:55:38 +0000 (09:55 -0700)
committerDylan Baker <dylan@pnwbakers.com>
Wed, 8 May 2019 16:39:03 +0000 (09:39 -0700)
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>
meson.build

index f72bdc946bfbb5bcc873dfdc7e71f784ab3be900..8ab8a550f56c0141b18fd9078d166580926469be 100644 (file)
@@ -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