Mesa (master): meson: Adjust Clover's required LLVM modules

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: 80817b6e344258ac9b955f824ebf9019a0fc1610
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=80817b6e344258ac9b955f824ebf9019a0fc1610

Author: Jesse Natalie <jenatali at microsoft.com>
Date:   Wed Nov 18 18:30:30 2020 -0800

meson: Adjust Clover's required LLVM modules

When coming from CMake, all-targets doesn't exist, and Clover's
mechanism for finding Clang apparently requires the OpenMP frontend
lib but doesn't automatically pull it in.

Reviewed-by: Daniel Stone <daniels at collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7680>

---

 meson.build | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/meson.build b/meson.build
index 6d1607c35a3..f828eb80faa 100644
--- a/meson.build
+++ b/meson.build
@@ -1479,9 +1479,10 @@ if with_amd_vk or with_gallium_radeonsi or with_gallium_r600
 endif
 if with_gallium_opencl
   llvm_modules += [
-    'all-targets', 'linker', 'coverage', 'instrumentation', 'ipo', 'irreader',
-    'lto', 'option', 'objcarcopts', 'profiledata',
+    'linker', 'coverage', 'instrumentation', 'ipo', 'irreader',
+    'lto', 'option', 'objcarcopts', 'profiledata'
   ]
+  llvm_optional_modules += ['frontendopenmp']
 endif
 if with_microsoft_clc
   llvm_modules += ['target', 'linker', 'irreader', 'option', 'libdriver']