Merge branch 'features/newarch' of https://github.com/NERSC/spack into features/newarch

lib/spack/spack/spec.py

@@ -1307,7 +1307,7 @@ def satisfies(self, other, deps=True, strict=False):
             if not self.compiler.satisfies(other.compiler, strict=strict):
                 return  False
         elif strict and (other.compiler and not self.compiler):
-            return True
+            return False
 
         if not self.variants.satisfies(other.variants, strict=strict):
             return False

var/spack/mock_configs/site_spackconfig/compilers.yaml

@@ -13,10 +13,23 @@ compilers:
       fc: /path/to/gfortran
       modules: None
     gcc@5.2.0:
-        cc: cc
-        cxx: CC
-        f77: ftn
-        fc: ftn
-        modules:
+      cc: cc
+      cxx: CC
+      f77: ftn
+      fc: ftn
+      modules:
         - PrgEnv-gnu
         - gcc/5.2.0
+    intel@15.0.1:
+      cc: cc
+      ccx: CC
+      f77: ftn
+      fc: ftn
+      modules:
+      - PrgEnv-intel
+      - intel/15.0.1
+    intel@15.1.2:
+      cc: /path/to/icc
+      cxx: /path/to/ic++
+      f77: /path/to/ifort
+      fc: /path/to/ifort