| From fcd3260c03f313676720e6219c5953d412fb0a2c Mon Sep 17 00:00:00 2001 |
| From: Ross Burton <ross.burton@intel.com> |
| Date: Tue, 3 Jul 2018 13:59:09 +0100 |
| Subject: [PATCH] Make CPU family warnings fatal |
| |
| Upstream-Status: Inappropriate [OE specific] |
| Signed-off-by: Ross Burton <ross.burton@intel.com> |
| |
| --- |
| mesonbuild/envconfig.py | 4 ++-- |
| mesonbuild/environment.py | 6 ++---- |
| 2 files changed, 4 insertions(+), 6 deletions(-) |
| |
| diff --git a/mesonbuild/envconfig.py b/mesonbuild/envconfig.py |
| index 7e0c567..a180065 100644 |
| --- a/mesonbuild/envconfig.py |
| +++ b/mesonbuild/envconfig.py |
| @@ -284,8 +284,8 @@ class MachineInfo(HoldableObject): |
| 'but is missing {}.'.format(minimum_literal - set(literal))) |
| |
| cpu_family = literal['cpu_family'] |
| - if cpu_family not in known_cpu_families: |
| - mlog.warning(f'Unknown CPU family {cpu_family}, please report this at https://github.com/mesonbuild/meson/issues/new') |
| + if cpu_family not in known_cpu_families and cpu_family != "riscv": |
| + raise EnvironmentException('Unknown CPU family {}, see https://wiki.yoctoproject.org/wiki/Meson/UnknownCPU for directions.'.format(cpu_family)) |
| |
| endian = literal['endian'] |
| if endian not in ('little', 'big'): |
| diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py |
| index e212c7a..9d2bff3 100644 |
| --- a/mesonbuild/environment.py |
| +++ b/mesonbuild/environment.py |
| @@ -345,10 +345,8 @@ def detect_cpu_family(compilers: CompilersDict) -> str: |
| if compilers and not any_compiler_has_define(compilers, '__mips64'): |
| trial = 'mips' |
| |
| - if trial not in known_cpu_families: |
| - mlog.warning(f'Unknown CPU family {trial!r}, please report this at ' |
| - 'https://github.com/mesonbuild/meson/issues/new with the ' |
| - 'output of `uname -a` and `cat /proc/cpuinfo`') |
| + if trial not in known_cpu_families and trail != "riscv": |
| + raise EnvironmentException('Unknown CPU family %s, see https://wiki.yoctoproject.org/wiki/Meson/UnknownCPU for directions.' % trial) |
| |
| return trial |
| |