From af8dde4ddaa20bdcc1f191fdc9976cbd8b2aa441 Mon Sep 17 00:00:00 2001
From: "Adam J. Stewart" <ajstewart426@gmail.com>
Date: Wed, 18 Jul 2018 11:36:22 -0500
Subject: [PATCH] shell: Add spack to PATH before calling spack in
 setup-env.csh (#8740)

---
 share/spack/setup-env.csh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/share/spack/setup-env.csh b/share/spack/setup-env.csh
index a153374028..cf1059a28f 100755
--- a/share/spack/setup-env.csh
+++ b/share/spack/setup-env.csh
@@ -40,12 +40,12 @@ if ($?SPACK_ROOT) then
     alias _spack_pathadd 'set _pa_args = (\!*) && source $_spack_share_dir/csh/pathadd.csh'
 
     # Set variables needed by this script
+    _spack_pathadd PATH "$SPACK_ROOT/bin"
     eval `spack --print-shell-vars csh`
 
     # Set up modules and dotkit search paths in the user environment
     _spack_pathadd DK_NODE    "$_sp_dotkit_root/$_sp_sys_type"
     _spack_pathadd MODULEPATH "$_sp_tcl_root/$_sp_sys_type"
-    _spack_pathadd PATH       "$SPACK_ROOT/bin"
 else
     echo "ERROR: Sourcing spack setup-env.csh requires setting SPACK_ROOT to the root of your spack installation"
 endif
-- 
GitLab