build: Don't use ld and objcopy when cross-compiling

These commands don't work when compiling Windows binaries on Linux.

diff --git a/demos/gtk-demo/meson.build b/demos/gtk-demo/meson.build
index f594cd59b29cb96ec45bb1c22cc82cd1f30df587..fa63dbbb9be1a10999d5de424d8370f2519e1c1a 100644 (file)
--- a/demos/gtk-demo/meson.build
+++ b/demos/gtk-demo/meson.build
@@ -160,7 +160,7 @@ endif
 
 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')
 
   # Create the resource blob

diff --git a/demos/widget-factory/meson.build b/demos/widget-factory/meson.build
index 9a083eb1aca5dbb6ae6e019be3bac1596dbcc8c2..2cfc9732dc8f58099e98dc5d2108fa53279ed332 100644 (file)
--- a/demos/widget-factory/meson.build
+++ b/demos/widget-factory/meson.build
@@ -8,7 +8,7 @@ endif
 
 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')
 
   # Create the resource blob