summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLone_Wolf <lone_wolf@klaas-de-kat.nl>2023-04-27 19:46:29 +0200
committerMarge Bot <emma+marge@anholt.net>2023-04-27 23:06:42 +0000
commita1b46b5e66797369ae004166385e4304ced8a098 (patch)
treef8195e140a983bf990a2fff5ae7a73e1c404be30
parentd09a7132d8162ffa14fdbf71feea2a19b0158097 (diff)
downloadmesa-a1b46b5e66797369ae004166385e4304ced8a098.tar.gz
clc: Add clang frontendhlsl module to fix build of microsoft-clc with llvm 16+
Cc: mesa-stable Reviewed-by: Jesse Natalie <jenatali@microsoft.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/22741>
-rw-r--r--meson.build7
1 files changed, 4 insertions, 3 deletions
diff --git a/meson.build b/meson.build
index 2b6fb31a34c..37c323200a8 100644
--- a/meson.build
+++ b/meson.build
@@ -1624,9 +1624,10 @@ if with_gallium_opencl
endif
if with_clc
llvm_modules += ['coverage', 'target', 'linker', 'irreader', 'option', 'libdriver', 'lto']
- # all-targets is needed to support static linking LLVM build with multiple targets
- # windowsdriver is needded with LLVM>=15, but we don't know what LLVM verrsion we are using yet
- llvm_optional_modules += ['all-targets', 'windowsdriver']
+ # 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']
endif
draw_with_llvm = get_option('draw-use-llvm')
if draw_with_llvm