From dc243a5113dafa691a21144fd819865e5ba4c1c7 Mon Sep 17 00:00:00 2001 From: Philip Withnall Date: Wed, 24 Nov 2021 12:01:39 +0000 Subject: [PATCH] tests: Allow `objcopy --help` to fail, because it fails on FreeBSD MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This is a partial revert of b248f3481ced. Eventually, this commit can be dropped once `objcopy --help` doesn’t exit with a non-zero status on FreeBSD. See: https://gitlab.gnome.org/GNOME/glib/-/merge_requests/2360#note_1318608 Signed-off-by: Philip Withnall --- gio/tests/meson.build | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/gio/tests/meson.build b/gio/tests/meson.build index 3f29543b1..b563e8dde 100644 --- a/gio/tests/meson.build +++ b/gio/tests/meson.build @@ -683,7 +683,14 @@ if not meson.is_cross_build() or meson.has_exe_wrapper() objcopy_supports_add_symbol = false objcopy = find_program('objcopy', required : false) if objcopy.found() - objcopy_supports_add_symbol = run_command(objcopy, '--help', check: true).stdout().contains('--add-symbol') + # FIXME: This should be `check: true` because we never really expect + # `objcopy --help` to fail, given that `objcopy` exists. However, it does + # fail on FreeBSD because ELF Tool Chain has + # [a bug](https://sourceforge.net/p/elftoolchain/code/3950/). + # This can be changed back to `check: true` once our CI uses a FreeBSD + # version which includes the fix. + # See https://gitlab.gnome.org/GNOME/glib/-/merge_requests/2360#note_1318608 + objcopy_supports_add_symbol = run_command(objcopy, '--help', check: false).stdout().contains('--add-symbol') endif ld = find_program('ld', required : false)