From 568305ddffdaf475979589a0dad85c339ad88b7d Mon Sep 17 00:00:00 2001
From: Matt Belhorn <belhornmp@ornl.gov>
Date: Thu, 11 Aug 2016 13:56:21 -0400
Subject: Corrects Cray compiler name and adds missing version flag.

---
 lib/spack/spack/compilers/cce.py    | 55 ++++++++++++++++++++++++++++++++++++
 lib/spack/spack/compilers/craype.py | 56 -------------------------------------
 2 files changed, 55 insertions(+), 56 deletions(-)
 create mode 100644 lib/spack/spack/compilers/cce.py
 delete mode 100644 lib/spack/spack/compilers/craype.py

diff --git a/lib/spack/spack/compilers/cce.py b/lib/spack/spack/compilers/cce.py
new file mode 100644
index 0000000000..43d000dd69
--- /dev/null
+++ b/lib/spack/spack/compilers/cce.py
@@ -0,0 +1,55 @@
+##############################################################################
+# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
+# Produced at the Lawrence Livermore National Laboratory.
+#
+# This file is part of Spack.
+# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
+# LLNL-CODE-647188
+#
+# For details, see https://github.com/llnl/spack
+# Please also see the LICENSE file for our notice and the LGPL.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU Lesser General Public License (as
+# published by the Free Software Foundation) version 2.1, February 1999.
+#
+# This program is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
+# conditions of the GNU Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+##############################################################################
+from spack.compiler import *
+
+
+class Cce(Compiler):
+    """Cray compiler environment compiler."""
+    # Subclasses use possible names of C compiler
+    cc_names = ['cc']
+
+    # Subclasses use possible names of C++ compiler
+    cxx_names = ['CC']
+
+    # Subclasses use possible names of Fortran 77 compiler
+    f77_names = ['ftn']
+
+    # Subclasses use possible names of Fortran 90 compiler
+    fc_names = ['ftn']
+
+    # MacPorts builds gcc versions with prefixes and -mp-X.Y suffixes.
+    suffixes = [r'-mp-\d\.\d']
+
+    PrgEnv = 'PrgEnv-cray'
+    PrgEnv_compiler = 'cce'
+
+    link_paths = {'cc': 'cc',
+                  'cxx': 'c++',
+                  'f77': 'f77',
+                  'fc': 'fc'}
+
+    @classmethod
+    def default_version(cls, comp):
+        return get_compiler_version(comp, '-V', r'[Vv]ersion.*(\d+(\.\d+)+)')
diff --git a/lib/spack/spack/compilers/craype.py b/lib/spack/spack/compilers/craype.py
deleted file mode 100644
index c92e5c131a..0000000000
--- a/lib/spack/spack/compilers/craype.py
+++ /dev/null
@@ -1,56 +0,0 @@
-##############################################################################
-# Copyright (c) 2013-2016, Lawrence Livermore National Security, LLC.
-# Produced at the Lawrence Livermore National Laboratory.
-#
-# This file is part of Spack.
-# Created by Todd Gamblin, tgamblin@llnl.gov, All rights reserved.
-# LLNL-CODE-647188
-#
-# For details, see https://github.com/llnl/spack
-# Please also see the LICENSE file for our notice and the LGPL.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License (as
-# published by the Free Software Foundation) version 2.1, February 1999.
-#
-# This program is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the IMPLIED WARRANTY OF
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the terms and
-# conditions of the GNU Lesser General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public
-# License along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
-##############################################################################
-from spack.compiler import *
-
-
-class Craype(Compiler):
-    """Cray programming environment compiler."""
-
-    # Subclasses use possible names of C compiler
-    cc_names = ['cc']
-
-    # Subclasses use possible names of C++ compiler
-    cxx_names = ['CC']
-
-    # Subclasses use possible names of Fortran 77 compiler
-    f77_names = ['ftn']
-
-    # Subclasses use possible names of Fortran 90 compiler
-    fc_names = ['ftn']
-
-    # MacPorts builds gcc versions with prefixes and -mp-X.Y suffixes.
-    suffixes = [r'-mp-\d\.\d']
-
-    PrgEnv = 'PrgEnv-cray'
-    PrgEnv_compiler = 'craype'
-
-    link_paths = {'cc': 'cc',
-                  'cxx': 'c++',
-                  'f77': 'f77',
-                  'fc': 'fc'}
-
-    @classmethod
-    def default_version(cls, comp):
-        return get_compiler_version(comp, r'([Vv]ersion).*(\d+(\.\d+)+)')
-- 
cgit v1.2.3-60-g2f50