diff options
| author | Sebastian Dröge <slomo@coaxion.net> | 2021-01-06 08:34:52 +0000 |
|---|---|---|
| committer | Sebastian Dröge <slomo@coaxion.net> | 2021-01-06 08:34:52 +0000 |
| commit | 609d1e292f592c2f615d45abb3fd249b4f2abdc1 (patch) | |
| tree | 7dd767cda7404c2ec8ea0621de0bc91fce33789e /gio | |
| parent | 179679837b91beeabdfc4b2783e5214c3274a428 (diff) | |
| parent | ea0c4bf0459a5571c709d2e052b2791ef26be07e (diff) | |
| download | glib-609d1e292f592c2f615d45abb3fd249b4f2abdc1.tar.gz | |
Merge branch 'fix/android-system-checks' into 'master'
build: Fix Android system checks
See merge request GNOME/glib!1856
Diffstat (limited to 'gio')
| -rw-r--r-- | gio/meson.build | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gio/meson.build b/gio/meson.build index 8030f60a5..e0a190cd6 100644 --- a/gio/meson.build +++ b/gio/meson.build @@ -12,7 +12,7 @@ gnetworking_h_conf = configuration_data() gnetworking_h_nameser_compat_include = '' -if host_system != 'windows' and not host_system.contains('android') +if host_system not in ['windows', 'android'] # Don't check for C_IN on Android since it does not define it in public # headers, we define it ourselves wherever necessary if not cc.compiles('''#include <sys/types.h> @@ -148,7 +148,7 @@ if host_system != 'windows' endif -if host_system.contains('android') +if host_system == 'android' # struct ip_mreq_source definition is broken on Android NDK <= r16 # See https://bugzilla.gnome.org/show_bug.cgi?id=740791 if not cc.compiles('''#include <netinet/in.h> |