Module: Mesa Branch: master Commit: d975e6940e2e511825a2feb31b5b1da7e6e23248 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=d975e6940e2e511825a2feb31b5b1da7e6e23248
Author: Eric Anholt <[email protected]> Date: Wed Nov 8 11:52:09 2017 -0800 meson: Leave dep_llvm empty if !with_llvm 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. Reviewed-by: Dylan Baker <[email protected]> Tested-by: Timothy Arceri <[email protected]> --- meson.build | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/meson.build b/meson.build index 314d15ac46..d8a8bb0066 100644 --- a/meson.build +++ b/meson.build @@ -661,10 +661,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 _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
