summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJesse Natalie <jenatali@microsoft.com>2020-11-18 18:30:30 -0800
committerJesse Natalie <jenatali@microsoft.com>2020-12-02 10:12:28 -0800
commit80817b6e344258ac9b955f824ebf9019a0fc1610 (patch)
treec6ce8003a58b17630737dbd80e27172d4588f819
parent959e0177990356d450da87eda0e7f99039656960 (diff)
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@collabora.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/7680>
-rw-r--r--meson.build5
1 files 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']