From 192de0108c235f8d7d7c5181ed4313c7fd3c5250 Mon Sep 17 00:00:00 2001 From: Lone_Wolf Date: Thu, 27 Apr 2023 19:46:29 +0200 Subject: [PATCH] clc: Add clang frontendhlsl module to fix build of microsoft-clc with llvm 16+ Cc: mesa-stable Reviewed-by: Jesse Natalie Part-of: (cherry picked from commit a1b46b5e66797369ae004166385e4304ced8a098) --- .pick_status.json | 2 +- meson.build | 7 ++++--- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 177d901081d09..46799dfc3866a 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -787,7 +787,7 @@ "description": "clc: Add clang frontendhlsl module to fix build of microsoft-clc with llvm 16+", "nominated": true, "nomination_type": 0, - "resolution": 0, + "resolution": 1, "main_sha": null, "because_sha": null }, diff --git a/meson.build b/meson.build index b6749d4284177..22385d886167a 100644 --- a/meson.build +++ b/meson.build @@ -1617,9 +1617,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