summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDylan Baker <dylan.c.baker@intel.com>2021-04-16 09:24:27 -0700
committerMarge Bot <eric+marge@anholt.net>2021-04-19 23:23:59 +0000
commit5b9253c28706f3719bffd147b4fa803c7ef544a7 (patch)
treeeba17b658adf721b2de478a1df3905cd408ea986
parentf5133f6bce1b0fb2ad967c4d9e28a8378971859d (diff)
meson: OpenMP is supposed to be optional
The code around it checks that it is found, so clearly it was meant to be optional, not arequired. Fixes: cd2832ee5107201493d59f70983f162653e53c7d ("meson: add an optional OpenMP dependency for AMD tests") Reviewed-by: Erik Faye-Lund <erik.faye-lund@collabora.com> Tested-by: Bernd Kuhls <bernd.kuhls@t-online.de> Reviewed-by: Marek Olšák <marek.olsak@amd.com> Reviewed-by: Eric Engestrom <eric@engestrom.ch> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10286>
-rw-r--r--meson.build2
1 files changed, 1 insertions, 1 deletions
diff --git a/meson.build b/meson.build
index 2849ae00492..7c1cc07fd59 100644
--- a/meson.build
+++ b/meson.build
@@ -1872,7 +1872,7 @@ dep_openmp = null_dep
# Even if we find OpenMP, Gitlab CI fails to link with gcc/i386 and clang/anyarch.
if host_machine.cpu_family() == 'x86_64' and cc.get_id() == 'gcc'
- dep_openmp = dependency('openmp')
+ dep_openmp = dependency('openmp', required : false)
if dep_openmp.found()
pre_args += ['-DHAVE_OPENMP']
endif