hlrs-software-stack/spack
7
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

Browse source
This commit is contained in:
Gregory Becker 2016-07-21 14:50:23 -07:00
parent 1544f98ee0
commit bcbe9c02da
1 changed files with 6 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
lib/spack/spack/platforms/cray_xc.py
View file

@ -1,10 +1,10 @@
import os import os
#import spack import spack
from spack.architecture import Platform, Target from spack.architecture import Platform, Target
from spack.operating_systems.linux_distro import LinuxDistro from spack.operating_systems.linux_distro import LinuxDistro
from spack.operating_systems.cnl import Cnl from spack.operating_systems.cnl import Cnl
from spack.util.executable import which from spack.util.executable import which
#from llnl.util.filesystem import join_path from llnl.util.filesystem import join_path
class CrayXc(Platform): class CrayXc(Platform):
@ -52,9 +52,10 @@ def setup_platform_environment(self, pkg, env):
similar to linux/standard linker behavior similar to linux/standard linker behavior
""" """
env.set('CRAYPE_LINK_TYPE', 'dynamic') env.set('CRAYPE_LINK_TYPE', 'dynamic')
# cray_wrapper_names = join_path(spack.build_env_path, 'cray') cray_wrapper_names = join_path(spack.build_env_path, 'cray')
# if os.path.isdir(cray_wrapper_names): if os.path.isdir(cray_wrapper_names):
# env.prepend_path('PATH', cray_wrapper_names) env.prepend_path('PATH', cray_wrapper_names)
env.prepend_path('SPACK_ENV_PATHS', cray_wrapper_names)
@classmethod @classmethod
def detect(self): def detect(self):