summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorBrian Van Essen <vanessen1@llnl.gov>2023-03-01 23:19:20 -0800
committerGitHub <noreply@github.com>2023-03-01 23:19:20 -0800
commiteb29889f6eae9c415895f34023b84f1d72d01ef4 (patch)
tree7e9df15d90e4438b743c112a23263ad020a89a1a /lib
parentae27df4113490140dc9efa57d6289d51fc6787b5 (diff)
downloadspack-eb29889f6eae9c415895f34023b84f1d72d01ef4.tar.gz
spack-eb29889f6eae9c415895f34023b84f1d72d01ef4.tar.bz2
spack-eb29889f6eae9c415895f34023b84f1d72d01ef4.tar.xz
spack-eb29889f6eae9c415895f34023b84f1d72d01ef4.zip
Detection of Cray's slingshot detection has relied on the presence of (#35779)
a shared library /lib64/libcxi.so, which seems to also appear on other non-slingshot systems. This patch also checks to make sure that there is a Cray programming enviornment in /opt/cray/pe in addition to the shared library.
Diffstat (limited to 'lib')
-rw-r--r--lib/spack/spack/platforms/cray.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/spack/spack/platforms/cray.py b/lib/spack/spack/platforms/cray.py
index 70bb45af5f..3d88285f70 100644
--- a/lib/spack/spack/platforms/cray.py
+++ b/lib/spack/spack/platforms/cray.py
@@ -37,7 +37,7 @@ _xc_craype_dir = "/opt/cray/pe/cdt"
def slingshot_network():
- return os.path.exists("/lib64/libcxi.so")
+ return os.path.exists("/opt/cray/pe") and os.path.exists("/lib64/libcxi.so")
def _target_name_from_craype_target_name(name):