| Brad Bishop | 1a4b7ee | 2018-12-16 17:11:34 -0800 | [diff] [blame^] | 1 | From 2e8553fc01e62ebc4faa240bf20984a8a0ac7387 Mon Sep 17 00:00:00 2001 |
| 2 | From: Ross Burton <ross.burton@intel.com> |
| 3 | Date: Tue, 3 Jul 2018 13:59:09 +0100 |
| 4 | Subject: [PATCH] Make CPU family warnings fatal |
| 5 | |
| 6 | Upstream-Status: Inappropriate [OE specific] |
| 7 | Signed-off-by: Ross Burton <ross.burton@intel.com> |
| 8 | |
| 9 | --- |
| 10 | mesonbuild/environment.py | 6 ++---- |
| 11 | 1 file changed, 2 insertions(+), 4 deletions(-) |
| 12 | |
| 13 | diff --git a/mesonbuild/environment.py b/mesonbuild/environment.py |
| 14 | index d29a77f..267acf9 100644 |
| 15 | --- a/mesonbuild/environment.py |
| 16 | +++ b/mesonbuild/environment.py |
| 17 | @@ -239,9 +239,7 @@ def detect_cpu_family(compilers): |
| 18 | return 'x86_64' |
| 19 | |
| 20 | if trial not in known_cpu_families: |
| 21 | - mlog.warning('Unknown CPU family {!r}, please report this at ' |
| 22 | - 'https://github.com/mesonbuild/meson/issues/new with the' |
| 23 | - 'output of `uname -a` and `cat /proc/cpuinfo`'.format(trial)) |
| 24 | + raise EnvironmentException('Unknown CPU family %s, see https://wiki.yoctoproject.org/wiki/Meson/UnknownCPU for directions.' % trial) |
| 25 | |
| 26 | return trial |
| 27 | |
| 28 | @@ -1014,7 +1012,7 @@ class CrossBuildInfo: |
| 29 | raise EnvironmentException('Malformed value in cross file variable %s.' % entry) |
| 30 | |
| 31 | if entry == 'cpu_family' and res not in known_cpu_families: |
| 32 | - mlog.warning('Unknown CPU family %s, please report this at https://github.com/mesonbuild/meson/issues/new' % value) |
| 33 | + raise EnvironmentException('Unknown CPU family %s, see https://wiki.yoctoproject.org/wiki/Meson/UnknownCPU for directions.' % value) |
| 34 | |
| 35 | if self.ok_type(res): |
| 36 | self.config[s][entry] = res |