fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-20 07:20:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

amd: require LLVM when amd-use-llvm is enabled

Browse source 
Commit 2aaa6ebb "build/amd: add amd-use-llvm build option"
allows to build radeonsi and radv without LLVM dependency
so LLVM constraint is applicable when amd-use-llvm=true

Fixes: 82047fa8 ("amd: drop support for LLVM 15, 16, 17")
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/37695>
(cherry picked from commit dd2476a257)
This commit is contained in:
Mauro Rossi 2025-10-03 21:15:34 +02:00 • committed by Eric Engestrom
parent cea965eee5
commit 4ea070a741
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -5314,7 +5314,7 @@
"description": "amd: require LLVM when amd-use-llvm is enabled", "description": "amd: require LLVM when amd-use-llvm is enabled",
"nominated": true, "nominated": true,
"nomination_type": 2, "nomination_type": 2,
"resolution": 0, "resolution": 1,
"main_sha": null, "main_sha": null,
"because_sha": "82047fa82f1bbbbd4f1a9b05c034f79a00d85e31", "because_sha": "82047fa82f1bbbbd4f1a9b05c034f79a00d85e31",
"notes": null "notes": null

2
meson.build
View file

@ -1736,7 +1736,7 @@ endif
llvm_has_mcjit = host_machine.cpu_family() in ['aarch64', 'arm', 'ppc', 'ppc64', 's390x', 'x86', 'x86_64'] llvm_has_mcjit = host_machine.cpu_family() in ['aarch64', 'arm', 'ppc', 'ppc64', 's390x', 'x86', 'x86_64']
llvm_with_orcjit = get_option('llvm-orcjit') or not llvm_has_mcjit llvm_with_orcjit = get_option('llvm-orcjit') or not llvm_has_mcjit
if with_amd_vk or with_gallium_radeonsi if (with_amd_vk or with_gallium_radeonsi) and amd_with_llvm
_llvm_version = '>= 18.0.0' _llvm_version = '>= 18.0.0'
elif with_clc or llvm_with_orcjit elif with_clc or llvm_with_orcjit
_llvm_version = '>= 15.0.0' _llvm_version = '>= 15.0.0'