| Brad Bishop | 1932369 | 2019-04-05 15:28:33 -0400 | [diff] [blame^] | 1 | From 635fe26af51f20194c8b208e7d01303be1086d68 Mon Sep 17 00:00:00 2001 |
| 2 | From: Alexander Kanavin <alex.kanavin@gmail.com> |
| 3 | Date: Tue, 19 Feb 2019 10:31:11 +0100 |
| 4 | Subject: [PATCH] meson.build: do not hardcode 'linux' as the host system |
| 5 | |
| 6 | OE build system can set this to other values that include 'linux', |
| 7 | e.g. 'linux-gnueabi' |
| 8 | |
| 9 | Upstream-Status: Pending |
| 10 | Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> |
| 11 | --- |
| 12 | meson.build | 2 +- |
| 13 | 1 file changed, 1 insertion(+), 1 deletion(-) |
| 14 | |
| 15 | diff --git a/meson.build b/meson.build |
| 16 | index 4348f20..af5ed63 100644 |
| 17 | --- a/meson.build |
| 18 | +++ b/meson.build |
| 19 | @@ -1574,7 +1574,7 @@ atomicdefine = ''' |
| 20 | # We know that we can always use real ("lock free") atomic operations with MSVC |
| 21 | if cc.get_id() == 'msvc' or cc.links(atomictest, name : 'atomic ops') |
| 22 | have_atomic_lock_free = true |
| 23 | - if (host_system == 'android' or host_system == 'linux') and not cc.compiles(atomicdefine, name : 'atomic ops define') |
| 24 | + if (host_system == 'android' or host_system.contains('linux')) and not cc.compiles(atomicdefine, name : 'atomic ops define') |
| 25 | # When building for armv5 on Linux, gcc provides |
| 26 | # __sync_bool_compare_and_swap but doesn't define |
| 27 | # __GCC_HAVE_SYNC_COMPARE_AND_SWAP_4 |