Merge branch 'fix_woa64_1' into 'main'

Meson: fix support for aarch64-w64-mingw32 (Windows on ARM64)

Closes #3490

See merge request GNOME/glib!4330
This commit is contained in:
Nirbheek Chauhan 2024-10-04 17:07:44 +00:00
commit decd9bb1ca

View File

@ -1740,7 +1740,7 @@ glibconfig_conf.set('guint64_constant', guint64_constant)
if host_system == 'windows'
glibconfig_conf.set('g_pid_type', 'void*')
glibconfig_conf.set_quoted('g_pid_format', 'p')
if host_machine.cpu_family() == 'x86_64'
if host_machine.cpu_family() in ['x86_64', 'aarch64']
glibconfig_conf.set_quoted('g_pollfd_format', '%#' + int64_m + 'x')
else
glibconfig_conf.set_quoted('g_pollfd_format', '%#x')