diff options
| author | Dylan Baker <dylan.c.baker@intel.com> | 2021-04-16 09:24:27 -0700 |
|---|---|---|
| committer | Eric Engestrom <eric@engestrom.ch> | 2021-04-20 19:42:28 +0200 |
| commit | 7359a3cc1a51da081b575c5ccd1a8da6a4dbc1e5 (patch) | |
| tree | 60d00fe7bb3d5da773a6809bde0c31217420e0d0 | |
| parent | ee3c6aa21a53acf825ddbc274c1e76987a43d724 (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>
(cherry picked from commit 5b9253c28706f3719bffd147b4fa803c7ef544a7)
| -rw-r--r-- | .pick_status.json | 2 | ||||
| -rw-r--r-- | meson.build | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/.pick_status.json b/.pick_status.json index b0635fd1c86..efa1d6e2592 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -490,7 +490,7 @@ "description": "meson: OpenMP is supposed to be optional", "nominated": true, "nomination_type": 1, - "resolution": 0, + "resolution": 1, "master_sha": null, "because_sha": "cd2832ee5107201493d59f70983f162653e53c7d" }, diff --git a/meson.build b/meson.build index 8ef1e5f71aa..e1e94e71049 100644 --- a/meson.build +++ b/meson.build @@ -1860,7 +1860,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 |