[babl] Build: change can run flag name for clarity - change cc_can_run to can_run_host_binaries (per upcomi
- From: Øyvind "pippin" Kolås <ok src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [babl] Build: change can run flag name for clarity - change cc_can_run to can_run_host_binaries (per upcomi
- Date: Sun, 28 Jun 2020 15:26:09 +0000 (UTC)
commit 8431f78b0e3baa17a09fe1f8f062852af3e991cf
Author: John Marshall <jtm home gmail com>
Date: Thu Jun 25 08:02:03 2020 +0100
Build: change can run flag name for clarity
- change cc_can_run to can_run_host_binaries (per upcoming meson change)
docs/meson.build | 2 +-
meson.build | 8 ++++++--
2 files changed, 7 insertions(+), 3 deletions(-)
---
diff --git a/docs/meson.build b/docs/meson.build
index 4a771b5ff..eefeb915c 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 cc2b21638..6bef3819c 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
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]