From 527154e6dfa0c9e5f35aed56adad3279bac4eac3 Mon Sep 17 00:00:00 2001 From: Mike Nolta Date: Mon, 14 Dec 2015 15:36:53 -0500 Subject: fix env module sys_type on non-LLNL systems --- share/spack/setup-env.sh | 8 ++++---- 1 file 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" -- cgit v1.2.3-70-g09d2