diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2021-06-14 16:19:17 +0000 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2021-06-14 16:19:17 +0000 |
| commit | 9d2d99efe7da9fc37a7c4498a149cba9c8836382 (patch) | |
| tree | 28d5ebb49eee499485c10dfbfa26a14706f1871e | |
| parent | e7ebee5959a0fc7663b226d424722c85351e990e (diff) | |
| parent | e522768ef46de78a9ac11cbd81b7f92560228743 (diff) | |
| download | glib-9d2d99efe7da9fc37a7c4498a149cba9c8836382.tar.gz | |
Merge branch '2423-llvm-objcopy' into 'main'
tests: Allow GResource external data tests to use llvm-objcopy
Closes #2423
See merge request GNOME/glib!2154
| -rw-r--r-- | gio/tests/meson.build | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/gio/tests/meson.build b/gio/tests/meson.build index a926ae01a..98d1401d0 100644 --- a/gio/tests/meson.build +++ b/gio/tests/meson.build @@ -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 - # option. Currently only GNU ld and GNU objcopy support the right options. - # Support for --add-symbol was added to LLVM objcopy in 2019 - # (https://reviews.llvm.org/D58234). FIXME: This test could be enabled for - # LLVM once that support is in a stable release. + # option. Currently only GNU ld and objcopy, or (as of 2019) LLVM ld and + # objcopy, support the right options. objcopy_supports_add_symbol = false objcopy = find_program('objcopy', required : false) if objcopy.found() @@ -687,7 +685,7 @@ if not meson.is_cross_build() or meson.has_exe_wrapper() 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', input : 'test5.gresource.xml', output : 'test5.gresource', |