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

Merge branch 'fix-cross' into 'main'

Browse Source 
tests/meson.build: do not use can_run_host_binaries()

See merge request GNOME/glib!3067
This commit is contained in:
Philip Withnall 2022-11-14 13:01:48 +00:00
commit c54773f26f
2 changed files with 6 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

@ -700,7 +700,9 @@ if installed_tests_enabled
endforeach endforeach
endif endif
if meson.can_run_host_binaries() # FIXME: Work around Meson not automatically using exe_wrapper around glib_compile_resources
# https://github.com/mesonbuild/meson/issues/11029
if not meson.is_cross_build()
resource_plugin = [] resource_plugin = []
compiler_type = '--compiler=@0@'.format(cc.get_id()) compiler_type = '--compiler=@0@'.format(cc.get_id())

4
glib/tests/meson.build
View File

@ -431,7 +431,9 @@ foreach test_name, extra_args : python_tests
endforeach endforeach
# some testing of gtester functionality # some testing of gtester functionality
if meson.can_run_host_binaries() and host_system != 'windows' # FIXME: Work around Meson not automatically using exe_wrapper around gtester
# https://github.com/mesonbuild/meson/issues/11029
if not meson.is_cross_build() and host_system != 'windows'
xmllint = find_program('xmllint', required: false) xmllint = find_program('xmllint', required: false)
if xmllint.found() if xmllint.found()
tmpsample_xml = custom_target('tmpsample.xml', tmpsample_xml = custom_target('tmpsample.xml',