Merge pull request #350 from adamjstewart/features/nag

Add NAG Fortran Compiler support

5 files changed, 39 insertions, 4 deletions

diff --git a/lib/spack/env/cc b/lib/spack/env/cc
index 0966277a91..aacba996b3 100755
--- a/lib/spack/env/cc
+++ b/lib/spack/env/cc
@@ -94,11 +94,11 @@ case "$command" in
         command="$SPACK_CXX"
         language="C++"
         ;;
-    f90|fc|f95|gfortran|ifort|pgf90|xlf90)
+    f90|fc|f95|gfortran|ifort|pgf90|xlf90|nagfor)
         command="$SPACK_FC"
         language="Fortran 90"
         ;;
-    f77|gfortran|ifort|pgf77|xlf)
+    f77|gfortran|ifort|pgf77|xlf|nagfor)
         command="$SPACK_F77"
         language="Fortran 77"
         ;;
diff --git a/lib/spack/env/nag/nagfor b/lib/spack/env/nag/nagfor
new file mode 120000
index 0000000000..82c2b8e90a
--- /dev/null
+++ b/lib/spack/env/nag/nagfor
@@ -0,0 +1 @@
+../cc
\ No newline at end of file
diff --git a/lib/spack/spack/compiler.py b/lib/spack/spack/compiler.py
index a665f6062d..887e416dc5 100644
--- a/lib/spack/spack/compiler.py
+++ b/lib/spack/spack/compiler.py
@@ -24,6 +24,7 @@
 ##############################################################################
 import os
 import re
+import subprocess
 import itertools
 from datetime import datetime
 
@@ -51,7 +52,7 @@ _version_cache = {}
 def get_compiler_version(compiler_path, version_arg, regex='(.*)'):
     if not compiler_path in _version_cache:
         compiler = Executable(compiler_path)
-        output = compiler(version_arg, return_output=True, error=os.devnull)
+        output = compiler(version_arg, return_output=True, error=subprocess.STDOUT)
 
         match = re.search(regex, output)
         _version_cache[compiler_path] = match.group(1) if match else 'unknown'
diff --git a/lib/spack/spack/compilers/__init__.py b/lib/spack/spack/compilers/__init__.py
index facc9c338b..6159ef576c 100644
--- a/lib/spack/spack/compilers/__init__.py
+++ b/lib/spack/spack/compilers/__init__.py
@@ -51,7 +51,7 @@ _required_instance_vars = ['cc', 'cxx', 'f77', 'fc']
 if platform.system() == 'Darwin':
     _default_order = ['clang', 'gcc', 'intel']
 else:
-    _default_order = ['gcc', 'intel', 'pgi', 'clang', 'xlc']
+    _default_order = ['gcc', 'intel', 'pgi', 'clang', 'xlc', 'nag']
 
 
 def _auto_compiler_spec(function):
diff --git a/lib/spack/spack/compilers/nag.py b/lib/spack/spack/compilers/nag.py
new file mode 100644
index 0000000000..f1cc6be0d5
--- /dev/null
+++ b/lib/spack/spack/compilers/nag.py
@@ -0,0 +1,33 @@
+from spack.compiler import *
+
+class Nag(Compiler):
+    # Subclasses use possible names of C compiler
+    cc_names = []
+
+    # Subclasses use possible names of C++ compiler
+    cxx_names = []
+
+    # Subclasses use possible names of Fortran 77 compiler
+    f77_names = ['nagfor']
+
+    # Subclasses use possible names of Fortran 90 compiler
+    fc_names = ['nagfor']
+
+    # Named wrapper links within spack.build_env_path
+    link_paths = { # Use default wrappers for C and C++, in case provided in compilers.yaml
+                   'cc'  : 'cc',
+                   'cxx' : 'cxx',
+                   'f77' : 'nag/nagfor',
+                   'fc'  : 'nag/nagfor' }
+
+    @classmethod
+    def default_version(self, comp):
+        """The '-V' option works for nag compilers.
+           Output looks like this::
+
+               NAG Fortran Compiler Release 6.0(Hibiya) Build 1037
+               Product NPL6A60NA for x86-64 Linux
+               Copyright 1990-2015 The Numerical Algorithms Group Ltd., Oxford, U.K.
+        """
+        return get_compiler_version(
+            comp, '-V', r'NAG Fortran Compiler Release ([0-9.]+)')