From 4a5b81513561391f691fd4b7c99e54a182bfbd8b Mon Sep 17 00:00:00 2001
From: Rob Clark <robdclark@google.com>
Date: Mon, 8 Jun 2020 09:11:57 -0700
Subject: [PATCH 2/2] Revert "meson: Use cmake to find LLVM when building for
 windows"

This reverts commit 821cf6942a390f5f64d8a2cff9933b24c84f7dc1.
---
 meson.build | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/meson.build b/meson.build
index ef7a602cb03..0f07aa83aa6 100644
--- a/meson.build
+++ b/meson.build
@@ -1387,16 +1387,8 @@ else
 endif
 
 _shared_llvm = get_option('shared-llvm')
-_llvm = get_option('llvm')
-
-# The cmake method will never find libllvm.so|dylib; this is fine for windows
-# because llvm doesn't support libllvm.dll
-_llvm_method = 'config-tool'
-if (meson.version().version_compare('>= 0.51.0') and
-    host_machine.system() == 'windows')
-  _llvm_method = 'cmake'
-endif
 
+_llvm = get_option('llvm')
 dep_llvm = null_dep
 with_llvm = false
 if _llvm != 'false'
@@ -1410,7 +1402,7 @@ if _llvm != 'false'
       with_gallium_opencl or _llvm == 'true'
     ),
     static : not _shared_llvm,
-    method : _llvm_method,
+    method : 'config-tool',
     fallback : ['llvm', 'dep_llvm'],
   )
   with_llvm = dep_llvm.found()
-- 
2.26.2