summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCharles-Antoine Couret <charles-antoine.couret@mind.be>2020-03-26 21:09:49 +0100
committerAnuj Mittal <anuj.mittal@intel.com>2020-07-17 09:36:48 +0800
commitd9e58aff76edf1f5fdc31785fd81fae2c7c508c8 (patch)
treea28046d600c672d8b52b3f950b2685b30f573b2f
parentadd9b04f0596ade188224104595406d638a6fa73 (diff)
downloadopenembedded-core-contrib-d9e58aff76edf1f5fdc31785fd81fae2c7c508c8.tar.gz
openembedded-core-contrib-d9e58aff76edf1f5fdc31785fd81fae2c7c508c8.tar.bz2
openembedded-core-contrib-d9e58aff76edf1f5fdc31785fd81fae2c7c508c8.zip
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. 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>
-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 652b2be145..144c123a0e 100644
--- a/meta/lib/oe/utils.py
+++ b/meta/lib/oe/utils.py
@@ -387,7 +387,7 @@ def host_gcc_version(d, taskcontextonly=False):
except subprocess.CalledProcessError as e:
bb.fatal("Error running %s --version: %s" % (compiler, e.output.decode("utf-8")))
- match = re.match(r".* (\d\.\d)\.\d.*", output.split('\n')[0])
+ match = re.match(r".* (\d+\.\d+)\.\d+.*", output.split('\n')[0])
if not match:
bb.fatal("Can't get compiler version from %s --version output" % compiler)