mirror of
https://gitlab.gnome.org/GNOME/gtk.git
synced 2024-09-20 05:50:11 +00:00
build: Use more conservative GResource embedding on non-x86_64
Doing clever things with objcopy is faster and seems to be reliable on x86_64 Linux, but also doesn't work on all toolchains and architectures: in particular, Debian has had trouble with this on arm and mips. In a distro build environment where we are compiling all of GTK every time, the cost of potentially unreliable builds is higher than the cost of using slower but more conservative GResource embedding. Resolves: https://gitlab.gnome.org/GNOME/gtk/-/issues/5107 Signed-off-by: Simon McVittie <smcv@debian.org>
This commit is contained in:
parent
3a941eff4a
commit
60a83a51c3
@ -877,7 +877,7 @@ endif
|
||||
|
||||
ld = find_program('ld', required : false)
|
||||
|
||||
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()
|
||||
if not meson.is_cross_build() and build_machine.cpu_family() == 'x86_64' 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
|
||||
|
Loading…
Reference in New Issue
Block a user