diff options
| author | becker33 <becker33@llnl.gov> | 2016-07-21 15:06:42 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-21 15:06:42 -0700 |
| commit | dd5b1ac098dc7c7abf625ab8407af722cd68c3d0 (patch) | |
| tree | 6be030aaed1ac617cc4156a537c1b30eb601b329 | |
| parent | 098af1797137b0f84d4eb6d625a73fe45354357f (diff) | |
| parent | bcbe9c02dab6d4bc2690896ba259ed1b211f4346 (diff) | |
| download | spack-dd5b1ac098dc7c7abf625ab8407af722cd68c3d0.tar.gz spack-dd5b1ac098dc7c7abf625ab8407af722cd68c3d0.tar.bz2 spack-dd5b1ac098dc7c7abf625ab8407af722cd68c3d0.tar.xz spack-dd5b1ac098dc7c7abf625ab8407af722cd68c3d0.zip | |
Merge pull request #1335 from LLNL/crayxc-detection
Crayxc detection
| l--------- | lib/spack/env/cray/CC | 1 | ||||
| l--------- | lib/spack/env/cray/cc | 1 | ||||
| l--------- | lib/spack/env/cray/ftn | 1 | ||||
| -rw-r--r-- | lib/spack/spack/platforms/cray_xc.py | 3 |
4 files changed, 6 insertions, 0 deletions
diff --git a/lib/spack/env/cray/CC b/lib/spack/env/cray/CC new file mode 120000 index 0000000000..82c2b8e90a --- /dev/null +++ b/lib/spack/env/cray/CC @@ -0,0 +1 @@ +../cc
\ No newline at end of file diff --git a/lib/spack/env/cray/cc b/lib/spack/env/cray/cc new file mode 120000 index 0000000000..82c2b8e90a --- /dev/null +++ b/lib/spack/env/cray/cc @@ -0,0 +1 @@ +../cc
\ No newline at end of file diff --git a/lib/spack/env/cray/ftn b/lib/spack/env/cray/ftn new file mode 120000 index 0000000000..82c2b8e90a --- /dev/null +++ b/lib/spack/env/cray/ftn @@ -0,0 +1 @@ +../cc
\ No newline at end of file diff --git a/lib/spack/spack/platforms/cray_xc.py b/lib/spack/spack/platforms/cray_xc.py index 2b065d5bbd..03d0383cc5 100644 --- a/lib/spack/spack/platforms/cray_xc.py +++ b/lib/spack/spack/platforms/cray_xc.py @@ -1,8 +1,10 @@ import os +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 class CrayXc(Platform): @@ -53,6 +55,7 @@ class CrayXc(Platform): 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): |