1234567891011121314151617181920212223242526272829303132333435363738394041 |
- From 9311844b6c422479556e83b89a8e675ebcb2056c 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 | 2 +-
- mesonbuild/environment.py | 4 +---
- 2 files changed, 2 insertions(+), 4 deletions(-)
- diff --git a/mesonbuild/envconfig.py b/mesonbuild/envconfig.py
- index 219b62e..d1be65b 100644
- --- a/mesonbuild/envconfig.py
- +++ b/mesonbuild/envconfig.py
- @@ -199,7 +199,7 @@ class MachineInfo:
-
- cpu_family = literal['cpu_family']
- if cpu_family not in known_cpu_families:
- - mlog.warning('Unknown CPU family {}, please report this at https://github.com/mesonbuild/meson/issues/new'.format(cpu_family))
- + 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 bf09a88..8eabe78 100644
- --- a/mesonbuild/environment.py
- +++ b/mesonbuild/environment.py
- @@ -375,9 +375,7 @@ def detect_cpu_family(compilers: CompilersDict) -> str:
- trial = 'parisc'
-
- if trial not in known_cpu_families:
- - mlog.warning('Unknown CPU family {!r}, please report this at '
- - 'https://github.com/mesonbuild/meson/issues/new with the '
- - 'output of `uname -a` and `cat /proc/cpuinfo`'.format(trial))
- + raise EnvironmentException('Unknown CPU family %s, see https://wiki.yoctoproject.org/wiki/Meson/UnknownCPU for directions.' % trial)
-
- return trial
-
|