From 4c506b36c5e6762ce08b616fa32a6064f7766ad3 Mon Sep 17 00:00:00 2001
From: Gregory Becker <becker33.llnl.gov>
Date: Wed, 20 Jul 2016 10:25:07 -0700
Subject: [PATCH 1/4] Improved cray_xc detection

---
 lib/spack/spack/platforms/cray_xc.py | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/lib/spack/spack/platforms/cray_xc.py b/lib/spack/spack/platforms/cray_xc.py
index 0f6599ab30d..24aa614e864 100644
--- a/lib/spack/spack/platforms/cray_xc.py
+++ b/lib/spack/spack/platforms/cray_xc.py
@@ -45,10 +45,10 @@ def __init__(self):
 
     @classmethod
     def detect(self):
-        if os.path.exists('/cray_home'):
-            cc_verbose = which('cc')
-            cc_verbose.add_default_arg('-craype-verbose')
-            text = cc_verbose(output=str, error=str, ignore_errors=True).split()
+        try:
+            cc_verbose = which('ftn')
+            text = cc_verbose('-craype-verbose', output=str, error=str, ignore_errors=True).split()
             if '-D__CRAYXC' in text:
                 return True
-        return False
+        finally:
+            return False

From 26d1ddc176ac52ff76893432755de54cab3cecfc Mon Sep 17 00:00:00 2001
From: Gregory Becker <becker33.llnl.gov>
Date: Wed, 20 Jul 2016 10:28:38 -0700
Subject: [PATCH 2/4] Improved cray_xc detection bug fix

---
 lib/spack/spack/platforms/cray_xc.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/spack/spack/platforms/cray_xc.py b/lib/spack/spack/platforms/cray_xc.py
index 24aa614e864..8bc03874de9 100644
--- a/lib/spack/spack/platforms/cray_xc.py
+++ b/lib/spack/spack/platforms/cray_xc.py
@@ -50,5 +50,7 @@ def detect(self):
             text = cc_verbose('-craype-verbose', output=str, error=str, ignore_errors=True).split()
             if '-D__CRAYXC' in text:
                 return True
-        finally:
+            else:
+                return False
+        except:
             return False

From 0d18f7249c38fdf8c452acd39533b09d13031583 Mon Sep 17 00:00:00 2001
From: Gregory Becker <becker33.llnl.gov>
Date: Wed, 20 Jul 2016 10:50:18 -0700
Subject: [PATCH 3/4] fixed flake errors

---
 lib/spack/spack/platforms/cray_xc.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/lib/spack/spack/platforms/cray_xc.py b/lib/spack/spack/platforms/cray_xc.py
index 8bc03874de9..fd16f7d9baf 100644
--- a/lib/spack/spack/platforms/cray_xc.py
+++ b/lib/spack/spack/platforms/cray_xc.py
@@ -4,6 +4,7 @@
 from spack.operating_systems.cnl import Cnl
 from spack.util.executable import which
 
+
 class CrayXc(Platform):
     priority    = 20
     front_end   = 'sandybridge'
@@ -35,7 +36,7 @@ def __init__(self):
         self.add_target('ivybridge',
                         Target('ivybridge', 'craype-ivybridge'))
         self.add_target('haswell',
-                        Target('haswell','craype-haswell'))
+                        Target('haswell', 'craype-haswell'))
 
         # Front end of the cray platform is a linux distro.
         linux_dist = LinuxDistro()
@@ -47,7 +48,9 @@ def __init__(self):
     def detect(self):
         try:
             cc_verbose = which('ftn')
-            text = cc_verbose('-craype-verbose', output=str, error=str, ignore_errors=True).split()
+            text = cc_verbose('-craype-verbose', 
+                              output=str, error=str, 
+                              ignore_errors=True).split()
             if '-D__CRAYXC' in text:
                 return True
             else:

From 106147716ac73180ce80e693ea276612d36b2215 Mon Sep 17 00:00:00 2001
From: Gregory Becker <becker33.llnl.gov>
Date: Wed, 20 Jul 2016 11:00:56 -0700
Subject: [PATCH 4/4] fixed flake errors

---
 lib/spack/spack/platforms/cray_xc.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/lib/spack/spack/platforms/cray_xc.py b/lib/spack/spack/platforms/cray_xc.py
index fd16f7d9baf..e3c7761a945 100644
--- a/lib/spack/spack/platforms/cray_xc.py
+++ b/lib/spack/spack/platforms/cray_xc.py
@@ -48,8 +48,8 @@ def __init__(self):
     def detect(self):
         try:
             cc_verbose = which('ftn')
-            text = cc_verbose('-craype-verbose', 
-                              output=str, error=str, 
+            text = cc_verbose('-craype-verbose',
+                              output=str, error=str,
                               ignore_errors=True).split()
             if '-D__CRAYXC' in text:
                 return True