diff options
author | Andreas M?ller <schnitzeltony@gmail.com> | 2020-04-16 00:30:36 +0200 |
---|---|---|
committer | Steve Sakoman <steve@sakoman.com> | 2020-06-23 04:33:47 -1000 |
commit | e48425a7e80283cde95886e26f17cd687bb98468 (patch) | |
tree | 3aaa9fe2f0acdddb6defb0e2dfcc3a8d0bca984b | |
parent | 50789b582908f78d9bb2b5a05418433ad8074825 (diff) | |
download | openembedded-core-contrib-e48425a7e80283cde95886e26f17cd687bb98468.tar.gz |
meson.bbclass: avoid unexpected operating-system names
For example 'linux-gnueabi' is not what meson consumers expect: See canonical
table of OS names for Meson (thanks Ross). Surprisingly this did not pop up
earlier but wrong system-name can break building as described in [1]
[1] https://lists.openembedded.org/g/openembedded-core/topic/meson_host_machine_system/73023862
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
Signed-off-by: Ross Burton <ross.burton@arm.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
(cherry picked from commit 010202076760329829fbde8dab4f535d6f755873)
Signed-off-by: Steve Sakoman <steve@sakoman.com>
-rw-r--r-- | meta/classes/meson.bbclass | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/meta/classes/meson.bbclass b/meta/classes/meson.bbclass index e9628033c6..ff52d20e56 100644 --- a/meta/classes/meson.bbclass +++ b/meta/classes/meson.bbclass @@ -68,6 +68,9 @@ def meson_operating_system(var, d): os = d.getVar(var) if "mingw" in os: return "windows" + # avoid e.g 'linux-gnueabi' + elif "linux" in os: + return "linux" else: return os |