diff --git a/.pick_status.json b/.pick_status.json index 3d0301297074b..75e5762e4a818 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -8494,7 +8494,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, "notes": null diff --git a/meson.build b/meson.build index 557e2da50d9d8..955e4a103db21 100644 --- a/meson.build +++ b/meson.build @@ -1793,9 +1793,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