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

Merge branch 'meson_fixes' into 'main'

Browse Source 
meson: Check rres.compiled() before calling rres.returncode()

See merge request GNOME/glib!2642
This commit is contained in:
Philip Withnall 2022-05-09 12:08:10 +00:00
commit c8ea8cafd1
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, rres = cc.run(dlopen_dlsym_test_code,
dependencies : libdl_dep, dependencies : libdl_dep,
name : 'dlsym() preceding underscores') 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 g_module_need_uscore = 1
endif endif
else else

4
meson.build
View File

@ -1714,7 +1714,7 @@ va_list_val_copy_prog = '''
if cc_can_run if cc_can_run
rres = cc.run(va_list_val_copy_prog, name : 'va_lists can be copied as values') 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 else
glib_va_val_copy = meson.get_cross_property('va_val_copy', true) glib_va_val_copy = meson.get_cross_property('va_val_copy', true)
endif endif
@ -1993,7 +1993,7 @@ stack_grows_check_prog = '''
if cc_can_run if cc_can_run
rres = cc.run(stack_grows_check_prog, name : 'stack grows check') 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 else
growing_stack = meson.get_cross_property('growing_stack', false) growing_stack = meson.get_cross_property('growing_stack', false)
endif endif