diff options
| author | Christoph Reiter <reiter.christoph@gmail.com> | 2020-12-22 19:51:23 +0100 |
|---|---|---|
| committer | Jordan Petridis <jpetridis@gnome.org> | 2021-08-24 21:23:19 +0000 |
| commit | e190e70298be1186ad1a8a5dd0ac430463f76fee (patch) | |
| tree | b3fd923e54501963b290244fff7555b2f8a9baf6 | |
| parent | 36f23cc18bb75185a78f623dd457d034c49b45d2 (diff) | |
| download | libsoup-cherry-pick-01e361fc.tar.gz | |
meson: skip the fallback for sysprof on Windowscherry-pick-01e361fc
Otherwise it will download the subproject and fail when trying to build
it since sysprof is Linux only.
Instead skip the fallback on Windows, so that if force-enabled it will
fail, but in auto mode it will just skip sysprof.
(cherry picked from commit 01e361fcb9a4775e98ce13bc7f0c56ac405e9d3a)
| -rw-r--r-- | meson.build | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/meson.build b/meson.build index 0b79523b..eb52f877 100644 --- a/meson.build +++ b/meson.build @@ -164,7 +164,9 @@ libsysprof_capture_dep = dependency('sysprof-capture-4', 'with_sysprofd=none', 'help=false', ], - fallback: ['sysprof', 'libsysprof_capture_dep'], + # sysprof doesn't support Windows, so don't fall back to the subproject which fails to build, + # instead let it fail here so that sysprof gets skipped + fallback: (host_system != 'windows') ? ['sysprof', 'libsysprof_capture_dep'] : [], ) cdata.set('HAVE_SYSPROF', libsysprof_capture_dep.found()) |