Commit 57627244 authored by Pere Mato Vila's avatar Pere Mato Vila
Browse files

Merge branch 'SPI-2003' into 'master'

Handle compiler version suffix

Closes SPI-2003

See merge request !974
parents dacc5956 548baa85
Pipeline #3141261 passed with stage
in 7 minutes and 41 seconds
......@@ -443,6 +443,7 @@ def lcgcmake_upload(args):
#---Utility functions-----------------------------------------------------------------------------------
def make_compilerversion(command, version):
patt = re.compile('([0-9]+)[.]([0-9]+)')
suff = re.compile('.*[.]([^0-9]+)')
if command.endswith('gcc'):
mobj = patt.match(version)
if int(mobj.group(1)) >= 7 :
......@@ -458,6 +459,9 @@ def make_compilerversion(command, version):
elif ccommand.endswith('icc'):
mobj = patt.match(version)
compiler = 'icc' + mobj.group(1)
sobj = suff.match(version)
if sobj :
compiler += sobj.group(1)
return compiler
def install_tarfile(package, arch, osvers, suffix, prefix):
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment