From b6b2682bd649cf9a0799cdd1510cfe04dada0b0e Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Mon, 14 Mar 2022 08:44:09 -0400 Subject: [PATCH] build: Avoid objcopy on arm The trickery we do with objcopy and ld to speed up resource inclusion does not seem to work right on 32bit Arm, so just skip it there. Fixes: #4757, #4748, #4752 --- demos/gtk-demo/meson.build | 2 +- demos/widget-factory/meson.build | 2 +- gtk/meson.build | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/demos/gtk-demo/meson.build b/demos/gtk-demo/meson.build index fa63dbbb9b..1347baf2aa 100644 --- a/demos/gtk-demo/meson.build +++ b/demos/gtk-demo/meson.build @@ -160,7 +160,7 @@ endif ld = find_program('ld', required : false) -if not meson.is_cross_build() and build_machine.system() == 'linux' and objcopy.found() and objcopy_supports_add_symbol and ld.found() +if not meson.is_cross_build() and build_machine.cpu_family() != 'arm' and build_machine.system() == 'linux' and objcopy.found() and objcopy_supports_add_symbol and ld.found() glib_compile_resources = find_program('glib-compile-resources') # Create the resource blob diff --git a/demos/widget-factory/meson.build b/demos/widget-factory/meson.build index 2cfc9732dc..550eb09bd9 100644 --- a/demos/widget-factory/meson.build +++ b/demos/widget-factory/meson.build @@ -8,7 +8,7 @@ endif ld = find_program('ld', required : false) -if not meson.is_cross_build() and build_machine.system() == 'linux' and objcopy.found() and objcopy_supports_add_symbol and ld.found() +if not meson.is_cross_build() and build_machine.cpu_family() != 'arm' and build_machine.system() == 'linux' and objcopy.found() and objcopy_supports_add_symbol and ld.found() glib_compile_resources = find_program('glib-compile-resources') # Create the resource blob diff --git a/gtk/meson.build b/gtk/meson.build index 44fd1b8241..3a8457ada7 100644 --- a/gtk/meson.build +++ b/gtk/meson.build @@ -872,7 +872,7 @@ endif ld = find_program('ld', required : false) -if not meson.is_cross_build() and build_machine.system() == 'linux' and objcopy.found() and objcopy_supports_add_symbol and ld.found() +if not meson.is_cross_build() and build_machine.cpu_family() != 'arm' and build_machine.system() == 'linux' and objcopy.found() and objcopy_supports_add_symbol and ld.found() glib_compile_resources = find_program('glib-compile-resources') # Create the resource blob -- 2.30.2