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 4a771b5ff9d52e566499e5821ee95d160f9dfbe8..eefeb915c927b425344d93713f8c990fa32784cd 100644 (file)
--- 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 cc2b216389e9377840a233fd557ef12c5fe2d372..6bef3819cfa59a63f8fcf335505757b567538f3e 100644 (file)
--- 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