From f23dbcd6420188ba447e3fc50cf316dc20fb4114 Mon Sep 17 00:00:00 2001 From: pal1000 Date: Thu, 21 Jul 2022 13:02:07 +0300 Subject: [PATCH] meson: Only draw with llvm depends on native directly Tests, softpipe or AMD drivers don't depend on it directly Fixes: 3955dd07 ("meson/gallium: Add an option to not use LLVM for gallium draw module") Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/6817 Reviewed-by: Erik Faye-Lund Tested-by: Erik Faye-Lund Reviewed-by: Jesse Natalie Reviewed-by: Yonggang Luo Part-of: --- meson.build | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meson.build b/meson.build index f763f8d..bec326c 100644 --- a/meson.build +++ b/meson.build @@ -1703,7 +1703,7 @@ endif llvm_modules = ['bitwriter', 'engine', 'mcdisassembler', 'mcjit', 'core', 'executionengine', 'scalaropts', 'transformutils', 'instcombine'] llvm_optional_modules = ['coroutines'] if with_amd_vk or with_gallium_radeonsi or with_gallium_r600 - llvm_modules += ['amdgpu', 'native', 'bitreader', 'ipo'] + llvm_modules += ['amdgpu', 'bitreader', 'ipo'] if with_gallium_r600 llvm_modules += 'asmparser' endif @@ -1719,7 +1719,8 @@ if with_clc llvm_modules += ['coverage', 'target', 'linker', 'irreader', 'option', 'libdriver', 'lto'] llvm_optional_modules += ['all-targets'] endif -if with_tests or with_gallium_softpipe +draw_with_llvm = get_option('draw-use-llvm') +if draw_with_llvm llvm_modules += 'native' endif @@ -1765,7 +1766,6 @@ endif dep_llvm = null_dep with_llvm = false -draw_with_llvm = get_option('draw-use-llvm') if _llvm != 'disabled' dep_llvm = dependency( 'llvm', -- 2.7.4