Merge branch 'develop' into correct-cc

2016-02-12 12:55:26 -05:00
parent 9017ec5865 bcf705b85e
commit 64436e7752
546 changed files with 24468 additions and 2126 deletions
--- 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"
        ;;
--- a/lib/spack/env/nag/nagfor
+++ b/lib/spack/env/nag/nagfor
@@ -0,0 +1 @@
+../cc