fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-06 13:48:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

radeonsi/meson: don't use llvm variables when LLVM is disabled

Browse source 
also winsys doesn't use LLVM

Reviewed-by: Pierre-Eric
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/40589>
This commit is contained in:
Marek Olšák 2026-03-21 00:56:49 -04:00 • committed by Marge Bot
parent 8ea3d794fb
commit d692ce4b34
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/gallium/drivers/radeonsi/meson.build
View file

@ -86,8 +86,8 @@ files_libradeonsi = files(
)
radeonsi_include_dirs = [inc_src, inc_include, inc_gallium, inc_gallium_aux, inc_amd_common,
inc_amd_common_llvm, inc_gallium_drivers, inc_compiler, inc_amd, inc_amd_vpe, inc_virtio_gpu]
radeonsi_deps = [dep_llvm, dep_clock, dep_libdrm, idep_nir_headers, idep_amd_generated_headers,
inc_gallium_drivers, inc_compiler, inc_amd, inc_amd_vpe, inc_virtio_gpu]
radeonsi_deps = [dep_clock, dep_libdrm, idep_nir_headers, idep_amd_generated_headers,
idep_mesautil, idep_aco, idep_u_tracepoints, idep_si_tracepoints]
if with_perfetto
@ -173,7 +173,7 @@ libradeonsi = static_library(
driver_radeonsi = declare_dependency(
compile_args : ['-DGALLIUM_RADEONSI'] + libradeonsi_cflags,
link_with : radeonsi_gfx_libs + [
libradeonsi, libradeonwinsys, libamdgpuwinsys, libamd_common, libamd_common_llvm, libvpe, libgm, liblanczos
libradeonsi, libradeonwinsys, libamdgpuwinsys, amd_common_libs, libvpe, libgm, liblanczos
],
dependencies : idep_nir,
)

4
src/gallium/winsys/amdgpu/drm/meson.build
View file

@ -15,10 +15,10 @@ libamdgpuwinsys = static_library(
),
include_directories : [
inc_amd, inc_gallium, inc_gallium_aux, inc_include, inc_src,
inc_amd_common, inc_amd_common_llvm, inc_virtio_gpu
inc_amd_common, inc_virtio_gpu
],
gnu_symbol_visibility : 'hidden',
link_with : libamdgpu_addrlib,
dependencies : [dep_llvm, dep_libdrm_amdgpu, idep_amd_generated_headers, idep_mesautil],
dependencies : [dep_libdrm_amdgpu, idep_amd_generated_headers, idep_mesautil],
c_args : c_args
)