summaryrefslogtreecommitdiffstats
path: root/meta/lib/oe/utils.py
diff options
context:
space:
mode:
authorCharles-Antoine Couret <charles-antoine.couret@mind.be>2020-03-26 20:09:49 (GMT)
committerRichard Purdie <richard.purdie@linuxfoundation.org>2020-03-29 11:05:31 (GMT)
commitad366e738358455921f93b59e7ab3808747d7700 (patch)
treeac30e22d587f9b259c6f343796d015a96f6e7f5a /meta/lib/oe/utils.py
parent8ad0391f75ac3fe97d9b530a7d2950730780e81c (diff)
downloadpoky-ad366e738358455921f93b59e7ab3808747d7700.tar.gz
utils: fix gcc 10 version detection
Utils can not detect GCC 10 correctly due to wrong regex. It generates this error "ERROR: Can't get compiler version from gcc --version output" Sub-version numbers should be 1 or more digits instead of 1 only. (From OE-Core rev: 186fe4a3d390a52b87282c3e694ce3251e45ee78) Signed-off-by: Charles-Antoine Couret <charles-antoine.couret@mind.be> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/lib/oe/utils.py')
-rw-r--r--meta/lib/oe/utils.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/meta/lib/oe/utils.py b/meta/lib/oe/utils.py
index aee4336..9042b37 100644
--- a/meta/lib/oe/utils.py
+++ b/meta/lib/oe/utils.py
@@ -391,7 +391,7 @@ def host_gcc_version(d, taskcontextonly=False):
391 except subprocess.CalledProcessError as e: 391 except subprocess.CalledProcessError as e:
392 bb.fatal("Error running %s --version: %s" % (compiler, e.output.decode("utf-8"))) 392 bb.fatal("Error running %s --version: %s" % (compiler, e.output.decode("utf-8")))
393 393
394 match = re.match(r".* (\d\.\d)\.\d.*", output.split('\n')[0]) 394 match = re.match(r".* (\d+\.\d+)\.\d+.*", output.split('\n')[0])
395 if not match: 395 if not match:
396 bb.fatal("Can't get compiler version from %s --version output" % compiler) 396 bb.fatal("Can't get compiler version from %s --version output" % compiler)
397 397