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

meson: fix link failure with llvm-18

Browse source 
Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/10739
Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/10775
cc: mesa-stable

Signed-off-by: Karol Herbst <kherbst@redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/28267>
(cherry picked from commit 88a9576a3e)
This commit is contained in:
Karol Herbst 2024-03-19 14:31:04 +01:00 • committed by Eric Engestrom
parent c34dc4bebf
commit 6c9706d99e
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -1794,7 +1794,7 @@
"description": "meson: fix link failure with llvm-18",
"nominated": true,
"nomination_type": 0,
"resolution": 0,
"resolution": 1,
"main_sha": null,
"because_sha": null,
"notes": null

5
meson.build
View file

@ -1722,7 +1722,7 @@ if with_clc
# all-targets is needed to support static linking LLVM build with multiple targets.
# windowsdriver is needded with LLVM>=15 and frontendhlsl is needed with LLVM>=16,
# but we don't know what LLVM version we are using yet
llvm_optional_modules += ['all-targets', 'windowsdriver', 'frontendhlsl']
llvm_optional_modules += ['all-targets', 'windowsdriver', 'frontendhlsl', 'frontenddriver']
endif
draw_with_llvm = get_option('draw-use-llvm')
if draw_with_llvm
@ -1866,6 +1866,9 @@ if with_clc
if dep_llvm.version().version_compare('>= 16.0')
clang_modules += 'clangASTMatchers'
endif
if dep_llvm.version().version_compare('>= 18.0')
clang_modules += 'clangAPINotes'
endif
dep_clang = []
foreach m : clang_modules