Andrew Geissler | 5082cc7 | 2023-09-11 08:41:39 -0400 | [diff] [blame] | 1 | From c19d1f4a7e44e071df3a2612ae2eb20c84e831a6 Mon Sep 17 00:00:00 2001 |
| 2 | From: Emmanuele Bassi <ebassi@gnome.org> |
| 3 | Date: Thu, 10 Aug 2023 12:44:49 +0100 |
| 4 | Subject: [PATCH] build: Allow host builds when cross-compiling |
| 5 | |
| 6 | Environments that set up execution wrappers when cross-compiling should |
| 7 | be allowed to run code. We only fall back on external properties if we |
| 8 | really can't run any native code on the host machine. |
| 9 | |
| 10 | Upstream-Status: Backport |
| 11 | Signed-off-by: Ross Burton <ross.burton@arm.com> |
| 12 | --- |
| 13 | meson.build | 2 +- |
| 14 | 1 file changed, 1 insertion(+), 1 deletion(-) |
| 15 | |
| 16 | diff --git a/meson.build b/meson.build |
| 17 | index 48f22d7..7dcb9e6 100644 |
| 18 | --- a/meson.build |
| 19 | +++ b/meson.build |
| 20 | @@ -270,7 +270,7 @@ int main() { |
| 21 | return 0; |
| 22 | } |
| 23 | ''' |
| 24 | -if meson.is_cross_build() |
| 25 | +if not meson.can_run_host_binaries() |
| 26 | ieee754_float_div = meson.get_external_property('ieee754_float_div', cc.get_id() in ['gcc', 'clang']) |
| 27 | message('Cross-building, assuming IEEE 754 division:', ieee754_float_div) |
| 28 | else |