summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xvar/spack/repos/builtin/packages/cray-libsci/package.py14
1 files changed, 9 insertions, 5 deletions
diff --git a/var/spack/repos/builtin/packages/cray-libsci/package.py b/var/spack/repos/builtin/packages/cray-libsci/package.py
index be667c1337..3e4821a64d 100755
--- a/var/spack/repos/builtin/packages/cray-libsci/package.py
+++ b/var/spack/repos/builtin/packages/cray-libsci/package.py
@@ -14,6 +14,7 @@ class CrayLibsci(Package):
has_code = False # Skip attempts to fetch source that is not available
version("20.06.1")
+ version("20.03.1")
version("19.06.1")
version("18.12.1")
version("18.11.1.2")
@@ -55,16 +56,19 @@ class CrayLibsci(Package):
shared = True if "+shared" in self.spec else False
compiler = self.spec.compiler.name
+ lib = []
if "+openmp" in self.spec and "+mpi" in self.spec:
- lib = "libsci_{0}_mpi_mp"
+ lib = ["libsci_{0}_mpi_mp", "libsci_{0}_mp"]
elif "+openmp" in self.spec:
- lib = "libsci_{0}_mp"
+ lib = ["libsci_{0}_mp"]
elif "+mpi" in self.spec:
- lib = "libsci_{0}_mpi"
+ lib = ["libsci_{0}_mpi", "libsci_{0}"]
else:
- lib = "libsci_{0}"
+ lib = ["libsci_{0}"]
- libname = lib.format(self.canonical_names[compiler].lower())
+ libname = []
+ for lib_fmt in lib:
+ libname.append(lib_fmt.format(self.canonical_names[compiler].lower()))
return find_libraries(
libname,