From 6872db98fbce04b9f81c4cb1b0a1c052a5672e47 Mon Sep 17 00:00:00 2001 From: Eric Engestrom Date: Thu, 20 Nov 2025 22:38:58 +0100 Subject: [PATCH] meson: auto-disable `draw-use-llvm` when `llvm=disabled` The option's description is: > Whether to use LLVM for the Gallium draw module, if LLVM is included. Let's disable it right away if LLVM is disabled, to avoid some configurations from failing. Cc: mesa-stable Part-of: (cherry picked from commit 37c7d19e46a4863c120186a99ac0344c2dd31260) --- .pick_status.json | 2 +- meson.build | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 11dd935c02e..c9f2e6fcebc 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -4004,7 +4004,7 @@ "description": "meson: auto-disable `draw-use-llvm` when `llvm=disabled`", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": null, "notes": null diff --git a/meson.build b/meson.build index 1ab54ec65e3..95d7e50e4cd 100644 --- a/meson.build +++ b/meson.build @@ -1723,7 +1723,7 @@ if with_clc # but we don't know what LLVM version we are using yet llvm_optional_modules += ['all-targets', 'windowsdriver', 'frontendhlsl', 'frontenddriver'] endif -draw_with_llvm = get_option('draw-use-llvm') +draw_with_llvm = with_llvm.allowed() and get_option('draw-use-llvm') if draw_with_llvm llvm_modules += 'native' # lto is needded with LLVM>=15, but we don't know what LLVM verrsion we are using yet