diff options
| -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 |