Merge branch 'ebassi/cross-bundle' into 'master'

build: Don't use ld when cross-compiling

See merge request GNOME/gtk!4121
This commit is contained in:
Matthias Clasen 2021-11-04 18:11:40 +00:00
commit 9c1a41052b

View File

@ -872,7 +872,7 @@ endif
ld = find_program('ld', required : false) ld = find_program('ld', required : false)
if build_machine.system() == 'linux' and objcopy.found() and objcopy_supports_add_symbol and ld.found() if not meson.is_cross_build() and build_machine.system() == 'linux' and objcopy.found() and objcopy_supports_add_symbol and ld.found()
glib_compile_resources = find_program('glib-compile-resources') glib_compile_resources = find_program('glib-compile-resources')
# Create the resource blob # Create the resource blob