diff options
| author | Todd Gamblin <tgamblin@llnl.gov> | 2015-12-19 20:59:13 -0800 |
|---|---|---|
| committer | Todd Gamblin <tgamblin@llnl.gov> | 2015-12-19 20:59:13 -0800 |
| commit | 9edba1848968ce6539e6c3ee51fe56180f02ada8 (patch) | |
| tree | a2e4e9b0db3bbf436283fd0184c12339e8d1ff77 /share | |
| parent | 53cb7e828bdfd83a99e44e2c36bdf9219b941143 (diff) | |
| parent | 527154e6dfa0c9e5f35aed56adad3279bac4eac3 (diff) | |
| download | spack-9edba1848968ce6539e6c3ee51fe56180f02ada8.tar.gz spack-9edba1848968ce6539e6c3ee51fe56180f02ada8.tar.bz2 spack-9edba1848968ce6539e6c3ee51fe56180f02ada8.tar.xz spack-9edba1848968ce6539e6c3ee51fe56180f02ada8.zip | |
Merge pull request #230 from nolta/fix-env-mod-sys-type
fix environment module path when $SYS_TYPE isn't defined
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" |