diff options
| author | Mike Nolta <mike@nolta.net> | 2015-12-14 15:36:53 -0500 |
|---|---|---|
| committer | Mike Nolta <mike@nolta.net> | 2015-12-19 16:34:24 -0500 |
| commit | 527154e6dfa0c9e5f35aed56adad3279bac4eac3 (patch) | |
| tree | e61dafde09e726190821b12b4773115729a26d6c /share | |
| parent | 429e15c4a64d29926f1b7a7168c23592e7dec0b7 (diff) | |
| download | spack-527154e6dfa0c9e5f35aed56adad3279bac4eac3.tar.gz spack-527154e6dfa0c9e5f35aed56adad3279bac4eac3.tar.bz2 spack-527154e6dfa0c9e5f35aed56adad3279bac4eac3.tar.xz spack-527154e6dfa0c9e5f35aed56adad3279bac4eac3.zip | |
fix env module sys_type on non-LLNL systems
Diffstat (limited to 'share')
| -rwxr-xr-x | share/spack/setup-env.sh | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/share/spack/setup-env.sh b/share/spack/setup-env.sh index 5b03aa8955..47202f6087 100755 --- a/share/spack/setup-env.sh +++ b/share/spack/setup-env.sh @@ -173,8 +173,8 @@ fi # _sp_share_dir=$(cd "$(dirname $_sp_source_file)" && pwd) _sp_prefix=$(cd "$(dirname $(dirname $_sp_share_dir))" && pwd) - -# TODO: fix SYS_TYPE to something non-LLNL-specific -_spack_pathadd DK_NODE "${_sp_share_dir%/}/dotkit/$SYS_TYPE" -_spack_pathadd MODULEPATH "${_sp_share_dir%/}/modules/$SYS_TYPE" _spack_pathadd PATH "${_sp_prefix%/}/bin" + +_sp_sys_type=$(spack-python -c 'print(spack.architecture.sys_type())') +_spack_pathadd DK_NODE "${_sp_share_dir%/}/dotkit/$_sp_sys_type" +_spack_pathadd MODULEPATH "${_sp_share_dir%/}/modules/$_sp_sys_type" |