[Mesa-dev] [PATCH 1/4] meson: Leave dep_llvm empty if !with_llvm

[Eric Anholt]

The gallium auxiliary build would link against llvm, for the gallivm code
that it didn't build.  This broke the build on my armhf cross, where
libLLVM-3.9.so is not multiarch and thus points to x86-64 libs.
---
 meson.build | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/meson.build b/meson.build
index 44e062e01e9f..117ed7c087f4 100644
--- a/meson.build
+++ b/meson.build
@@ -657,10 +657,11 @@ llvm_modules = ['bitwriter', 'engine', 'mcdisassembler', 'mcjit']
 if with_amd_vk
   llvm_modules += ['amdgpu', 'bitreader', 'ipo']
 endif
-dep_llvm = dependency(
-  'llvm', version : '>= 3.9.0', required : with_amd_vk, modules : llvm_modules,
-)
+dep_llvm = []
 if with_llvm
+  dep_llvm = dependency(
+    'llvm', version : '>= 3.9.0', required : with_amd_vk, modules : llvm_modules,
+  )
   if dep_llvm.found()
     _llvm_version = dep_llvm.version().split('.')
     # Development versions of LLVM have an 'svn' suffix, we don't want that for
-- 
2.15.0