Merge branch 'SPI-2003' into 'master'

Handle compiler version suffix

Closes SPI-2003

See merge request !974

bin/lcgcmake

@@ -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):