summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Belhorn <belhornmp@ornl.gov>2016-08-11 13:56:21 -0400
committerMatt Belhorn <belhornmp@ornl.gov>2016-08-11 13:56:21 -0400
commit568305ddffdaf475979589a0dad85c339ad88b7d (patch)
treedd864803bd019ec406d095d18ecb836700b61e4b
parentcd6c370303ae6411c32eff311b315031fe244547 (diff)
downloadspack-568305ddffdaf475979589a0dad85c339ad88b7d.tar.gz
spack-568305ddffdaf475979589a0dad85c339ad88b7d.tar.bz2
spack-568305ddffdaf475979589a0dad85c339ad88b7d.tar.xz
spack-568305ddffdaf475979589a0dad85c339ad88b7d.zip
Corrects Cray compiler name and adds missing version flag.
-rw-r--r--lib/spack/spack/compilers/cce.py (renamed from lib/spack/spack/compilers/craype.py)9
1 files changed, 4 insertions, 5 deletions
diff --git a/lib/spack/spack/compilers/craype.py b/lib/spack/spack/compilers/cce.py
index c92e5c131a..43d000dd69 100644
--- a/lib/spack/spack/compilers/craype.py
+++ b/lib/spack/spack/compilers/cce.py
@@ -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+)+)')