From 568305ddffdaf475979589a0dad85c339ad88b7d Mon Sep 17 00:00:00 2001 From: Matt Belhorn Date: Thu, 11 Aug 2016 13:56:21 -0400 Subject: [PATCH] Corrects Cray compiler name and adds missing version flag. --- lib/spack/spack/compilers/{craype.py => cce.py} | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) rename lib/spack/spack/compilers/{craype.py => cce.py} (91%) diff --git a/lib/spack/spack/compilers/craype.py b/lib/spack/spack/compilers/cce.py similarity index 91% rename from lib/spack/spack/compilers/craype.py rename to 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+)+)')