From: John Marshall <jtm.home@gmail.com>
Date: Thu, 25 Jun 2020 07:02:03 +0000 (+0100)
Subject: Build: change can run flag name for clarity
X-Git-Tag: archive/raspbian/1%0.1.106-3+rpi1^2~15^2~8^2~6
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=8431f78b0e3baa17a09fe1f8f062852af3e991cf;p=babl.git

Build: change can run flag name for clarity
- change cc_can_run to can_run_host_binaries (per upcoming meson change)
---

diff --git a/docs/meson.build b/docs/meson.build
index 4a771b5..eefeb91 100644
--- a/docs/meson.build
+++ b/docs/meson.build
@@ -27,7 +27,7 @@ index_html_tmp_env = [
 ]
 
 # Don't build babl ref if cannot run compiled objects in this env
-if env_bin.found() and cc_can_run
+if env_bin.found() and can_run_host_binaries
   index_html_tmp = custom_target('index.html.tmp',
     input : babl_html_dump,
     output:'index.html.tmp',
diff --git a/meson.build b/meson.build
index cc2b216..6bef381 100644
--- a/meson.build
+++ b/meson.build
@@ -140,8 +140,12 @@ build_platform_win32 = (build_os.startswith('mingw') or
                         build_os.startswith('cygwin') or
                         build_os.startswith('windows'))
 
-# Only run cross compile objects if we have exe wrapper
-cc_can_run = not meson.is_cross_build() or meson.has_exe_wrapper()
+# Only try to run compiled programs if native compile or cross-compile
+# and have exe wrapper. If we don't need a wrapper (e.g. 32 bit build in
+# 64-bit environment) then set proprty has_exe_wrapper=true in cross 
+# file
+can_run_host_binaries = meson.has_exe_wrapper()
+
 
 ################################################################################
 # Compiler arguments