diff options
| author | Uli Schlachter <psychon@znc.in> | 2024-04-05 14:05:14 +0000 |
|---|---|---|
| committer | Uli Schlachter <psychon@znc.in> | 2024-04-05 14:05:14 +0000 |
| commit | 95ee2708b8e4d549e42618a34f6bb17faed96926 (patch) | |
| tree | b9463b79f57492fc19f8842c0bc95d82fa8a8705 | |
| parent | e190f9e0b69fc42611da880f2a4ed55e98f00b49 (diff) | |
| parent | 8d5037ed642b02cdb018e49866aa286f30a7b59a (diff) | |
Merge branch 'bugfix/cross-compile' into 'master'
meson: always skip IPC_RMID_DEFERRED_RELEASE check when cross compiling
See merge request cairo/cairo!534
| -rw-r--r-- | meson.build | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/meson.build b/meson.build index fc334f64b..2e351749c 100644 --- a/meson.build +++ b/meson.build @@ -372,7 +372,7 @@ if x11_dep.found() and xext_dep.found() # Can skip the run check by providing the result in a cross file or # native file as bool property value. - prop = meson.get_external_property('ipc_rmid_deferred_release', 'auto') + prop = meson.get_external_property('ipc_rmid_deferred_release', meson.is_cross_build() ? 'false' : 'auto') # We don't know the type of prop (bool, string) but need to differentiate # between a set value (bool) or the fallback value (string), so convert to # a string and check the string value. |