Added cray wrapper names directory to spack_env_paths so the spack compiler wrapper will remove them from the environment (prevents hang)

1 files changed, 6 insertions, 5 deletions

diff --git a/lib/spack/spack/platforms/cray_xc.py b/lib/spack/spack/platforms/cray_xc.py
index 92db78c43c..03d0383cc5 100644
--- a/lib/spack/spack/platforms/cray_xc.py
+++ b/lib/spack/spack/platforms/cray_xc.py
@@ -1,10 +1,10 @@
 import os
-#import spack
+import spack
 from spack.architecture import Platform, Target
 from spack.operating_systems.linux_distro import LinuxDistro
 from spack.operating_systems.cnl import Cnl
 from spack.util.executable import which
-#from llnl.util.filesystem import join_path
+from llnl.util.filesystem import join_path
 
 
 class CrayXc(Platform):
@@ -52,9 +52,10 @@ class CrayXc(Platform):
             similar to linux/standard linker behavior
         """
         env.set('CRAYPE_LINK_TYPE', 'dynamic')
-#        cray_wrapper_names = join_path(spack.build_env_path, 'cray')
-#        if os.path.isdir(cray_wrapper_names):
-#            env.prepend_path('PATH', cray_wrapper_names)
+        cray_wrapper_names = join_path(spack.build_env_path, 'cray')
+        if os.path.isdir(cray_wrapper_names):
+            env.prepend_path('PATH', cray_wrapper_names)
+            env.prepend_path('SPACK_ENV_PATHS', cray_wrapper_names)
 
     @classmethod
     def detect(self):