meson: auto-disable amd-use-llvm when llvm=disabled

The option's description is:
> Whether to use LLVM for the AMD drivers, if LLVM is included.

Let's disable it right away if LLVM is disabled, to avoid configurations
like the one in the issue below from failing.

Cc: mesa-stable
Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/14306
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/38558>
(cherry picked from commit 69bb927ebf)
This commit is contained in:
Eric Engestrom 2025-11-20 19:29:39 +01:00 committed by Eric Engestrom
parent a4350c69b4
commit 0cbf8cc0ca
2 changed files with 2 additions and 2 deletions

View file

@ -4014,7 +4014,7 @@
"description": "meson: auto-disable `amd-use-llvm` when `llvm=disabled`",
"nominated": true,
"nomination_type": 1,
"resolution": 0,
"resolution": 1,
"main_sha": null,
"because_sha": null,
"notes": null

View file

@ -40,7 +40,7 @@ if get_option('layout') != 'mirror'
endif
with_llvm = get_option('llvm')
amd_with_llvm = get_option('amd-use-llvm')
amd_with_llvm = with_llvm.allowed() and get_option('amd-use-llvm')
with_mesa_debug = get_option('buildtype') == 'debug'