luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-06-03 03:10:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'backport-2642-meson-undefined-glib-2-72' into 'glib-2-72'

Browse Source 
Backport !2642 “meson: Check rres.compiled() before calling rres.returncode()” to glib-2-72

See merge request GNOME/glib!2643
This commit is contained in:
Sebastian Dröge 2022-05-10 09:00:34 +00:00
commit 3d7d06a4a8
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gmodule/meson.build
View File

@ -30,7 +30,7 @@ if g_module_impl == 'G_MODULE_IMPL_DL'
rres = cc.run(dlopen_dlsym_test_code,
dependencies : libdl_dep,
name : 'dlsym() preceding underscores')
if host_system == 'windows' or rres.returncode() == 0
if host_system == 'windows' or (rres.compiled() and rres.returncode() == 0)
g_module_need_uscore = 1
endif
else

4
meson.build
View File

@ -1709,7 +1709,7 @@ va_list_val_copy_prog = '''
if cc_can_run
rres = cc.run(va_list_val_copy_prog, name : 'va_lists can be copied as values')
glib_va_val_copy = rres.returncode() == 0
glib_va_val_copy = rres.compiled() and rres.returncode() == 0
else
glib_va_val_copy = meson.get_cross_property('va_val_copy', true)
endif
@ -1988,7 +1988,7 @@ stack_grows_check_prog = '''
if cc_can_run
rres = cc.run(stack_grows_check_prog, name : 'stack grows check')
growing_stack = rres.returncode() == 0
growing_stack = rres.compiled() and rres.returncode() == 0
else
growing_stack = meson.get_cross_property('growing_stack', false)
endif