luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2024-12-26 15:36:14 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2423-llvm-objcopy' into 'main'

Browse Source 
tests: Allow GResource external data tests to use llvm-objcopy

Closes #2423

See merge request GNOME/glib!2154
This commit is contained in:
Simon McVittie 2021-06-14 16:19:17 +00:00
commit 9d2d99efe7
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gio/tests/meson.build
View File

@ -675,10 +675,8 @@ if not meson.is_cross_build() or meson.has_exe_wrapper()
] ]
# Create object file containing resource data for testing the --external-data # Create object file containing resource data for testing the --external-data
# option. Currently only GNU ld and GNU objcopy support the right options. # option. Currently only GNU ld and objcopy, or (as of 2019) LLVM ld and
# Support for --add-symbol was added to LLVM objcopy in 2019 # objcopy, support the right options.
# (https://reviews.llvm.org/D58234). FIXME: This test could be enabled for
# LLVM once that support is in a stable release.
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()
@ -687,7 +685,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper()
ld = find_program('ld', required : false) ld = find_program('ld', required : false)
if build_machine.system() == 'linux' and cc.get_id() == 'gcc' and objcopy.found() and objcopy_supports_add_symbol and ld.found() if build_machine.system() == 'linux' and objcopy.found() and objcopy_supports_add_symbol and ld.found()
test_gresource_binary = custom_target('test5.gresource', test_gresource_binary = custom_target('test5.gresource',
input : 'test5.gresource.xml', input : 'test5.gresource.xml',
output : 'test5.gresource', output : 'test5.gresource',