luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-03-15 04:05:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'backport-2360-meson-check-glib-2-70' into 'glib-2-70'

Browse Source 
Backport !2360 “meson: specify when commands need to succeed in run_command” to glib-2-70

See merge request GNOME/glib!2363
This commit is contained in:
Sebastian Dröge 2021-11-24 10:53:59 +00:00
commit 3562c9e16d
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gio/tests/meson.build
View File

@ -17,7 +17,7 @@ if build_machine.system() == 'linux'
libutil_name = 'libutil' libutil_name = 'libutil'
libutil = run_command('sh', '-c', libutil = run_command('sh', '-c',
'''ldconfig -p | grep -o "[[:space:]]@0@\.so\(\.[0-9]\+\)\?\b"''' '''ldconfig -p | grep -o "[[:space:]]@0@\.so\(\.[0-9]\+\)\?\b"'''
.format(libutil_name)).stdout().strip().split('\n') .format(libutil_name), check: false).stdout().strip().split('\n')
if libutil.length() > 0 if libutil.length() > 0
message('Found libutil as @0@'.format(libutil[0])) message('Found libutil as @0@'.format(libutil[0]))
@ -683,7 +683,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper()
objcopy_supports_add_symbol = false objcopy_supports_add_symbol = false
objcopy = find_program('objcopy', required : false) objcopy = find_program('objcopy', required : false)
if objcopy.found() if objcopy.found()
objcopy_supports_add_symbol = run_command(objcopy, '--help').stdout().contains('--add-symbol') objcopy_supports_add_symbol = run_command(objcopy, '--help', check: true).stdout().contains('--add-symbol')
endif endif
ld = find_program('ld', required : false) ld = find_program('ld', required : false)