summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBas Nieuwenhuizen <bas@basnieuwenhuizen.nl>2019-10-07 17:34:22 +0200
committerBas Nieuwenhuizen <bas@basnieuwenhuizen.nl>2019-10-08 03:24:49 +0200
commit72665a0f1f761678b5a2e5f2a8fb66a42028614c (patch)
tree9fa671e900361f6f48c8ac5df6e47aaa7a195ff2
parent3a08110d43ce268747d034cae03787080967bf71 (diff)
meson: Always add LLVM coroutines module.
It gets used by the gallium auxiliary draw module, which gets used pretty much always when LLVM is used as JIT. At the same time most builds don't hit the issue here because the shared library of LLVM contains all modules. Fixes: d32690b43c91 ("gallivm: add coroutine pass manager support") Closes: https://gitlab.freedesktop.org/mesa/mesa/issues/951 Reviewed-by: Gert Wollny <gert.wollny@collabora.com>
-rw-r--r--meson.build5
1 files changed, 1 insertions, 4 deletions
diff --git a/meson.build b/meson.build
index 1c14f4ddd29..8f30a94ed8d 100644
--- a/meson.build
+++ b/meson.build
@@ -1249,7 +1249,7 @@ if dep_libdrm.found()
endif
llvm_modules = ['bitwriter', 'engine', 'mcdisassembler', 'mcjit']
-llvm_optional_modules = []
+llvm_optional_modules = ['coroutines']
if with_amd_vk or with_gallium_radeonsi or with_gallium_r600
llvm_modules += ['amdgpu', 'native', 'bitreader', 'ipo']
if with_gallium_r600
@@ -1262,9 +1262,6 @@ if with_gallium_opencl
'lto', 'option', 'objcarcopts', 'profiledata',
]
endif
-if with_gallium_opencl or with_gallium_softpipe
- llvm_optional_modules += ['coroutines']
-endif
if with_amd_vk or with_gallium_radeonsi
_llvm_version = '>= 8.0.0'