Merge pull request #1484 from mpbelhorn/olcf/correct_cce_compiler_name
Olcf/correct cce compiler name
This commit is contained in:
commit
1be63348b5
1 changed files with 4 additions and 5 deletions
|
@ -25,9 +25,8 @@
|
|||
from spack.compiler import *
|
||||
|
||||
|
||||
class Craype(Compiler):
|
||||
"""Cray programming environment compiler."""
|
||||
|
||||
class Cce(Compiler):
|
||||
"""Cray compiler environment compiler."""
|
||||
# Subclasses use possible names of C compiler
|
||||
cc_names = ['cc']
|
||||
|
||||
|
@ -44,7 +43,7 @@ class Craype(Compiler):
|
|||
suffixes = [r'-mp-\d\.\d']
|
||||
|
||||
PrgEnv = 'PrgEnv-cray'
|
||||
PrgEnv_compiler = 'craype'
|
||||
PrgEnv_compiler = 'cce'
|
||||
|
||||
link_paths = {'cc': 'cc',
|
||||
'cxx': 'c++',
|
||||
|
@ -53,4 +52,4 @@ class Craype(Compiler):
|
|||
|
||||
@classmethod
|
||||
def default_version(cls, comp):
|
||||
return get_compiler_version(comp, r'([Vv]ersion).*(\d+(\.\d+)+)')
|
||||
return get_compiler_version(comp, '-V', r'[Vv]ersion.*(\d+(\.\d+)+)')
|
Loading…
Reference in a new issue