summaryrefslogtreecommitdiffstats
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-08-04 22:17:38 (GMT)
commitb9d6ffc341a54cab7b2b828520250b0bd124ebaa (patch)
tree101e8a896a0447baf60d39a14911b3adb4ae43c3
parent0ecd636a526815047c5464186f14963bd2c54954 (diff)
downloadpoky-b9d6ffc341a54cab7b2b828520250b0bd124ebaa.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: d9e58aff76edf1f5fdc31785fd81fae2c7c508c8) Signed-off-by: Charles-Antoine Couret <charles-antoine.couret@mind.be> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org> (cherry picked from commit 186fe4a3d390a52b87282c3e694ce3251e45ee78) Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-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 652b2be..144c123 100644
--- a/meta/lib/oe/utils.py
+++ b/meta/lib/oe/utils.py
@@ -387,7 +387,7 @@ def host_gcc_version(d, taskcontextonly=False):
387 except subprocess.CalledProcessError as e: 387 except subprocess.CalledProcessError as e:
388 bb.fatal("Error running %s --version: %s" % (compiler, e.output.decode("utf-8"))) 388 bb.fatal("Error running %s --version: %s" % (compiler, e.output.decode("utf-8")))
389 389
390 match = re.match(r".* (\d\.\d)\.\d.*", output.split('\n')[0]) 390 match = re.match(r".* (\d+\.\d+)\.\d+.*", output.split('\n')[0])
391 if not match: 391 if not match:
392 bb.fatal("Can't get compiler version from %s --version output" % compiler) 392 bb.fatal("Can't get compiler version from %s --version output" % compiler)
393 393