summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDominik Gresch <greschd@users.noreply.github.com>2021-06-12 12:02:56 +0200
committerGitHub <noreply@github.com>2021-06-12 10:02:56 +0000
commitdc8626b801daae79301b2906f88d49e2e3050be0 (patch)
tree4da520e1405ed67998a64de590f68ddffeb4d757
parent1b71d22194a901f8576052a31e9d03ae36974f58 (diff)
downloadspack-dc8626b801daae79301b2906f88d49e2e3050be0.tar.gz
spack-dc8626b801daae79301b2906f88d49e2e3050be0.tar.bz2
spack-dc8626b801daae79301b2906f88d49e2e3050be0.tar.xz
spack-dc8626b801daae79301b2906f88d49e2e3050be0.zip
IntelPackage: use 'version_yearlike' in check for libfabrics RPATH. (#16700)
Use the 'version_yearlike' attribute instead of 'version' to check if the SPACK_COMPILER_EXTRA_RPATHS should be set to include the built-in 'libfabrics'. When using the bare 'version', the comparison is wrong when building with 'intel-parallel-studio', which has the version format '<edition>.YYYY.Nupdate', due to the leading '<edition>'.
-rw-r--r--lib/spack/spack/build_systems/intel.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib/spack/spack/build_systems/intel.py b/lib/spack/spack/build_systems/intel.py
index 16a7e50084..9c0eb30a82 100644
--- a/lib/spack/spack/build_systems/intel.py
+++ b/lib/spack/spack/build_systems/intel.py
@@ -1089,7 +1089,7 @@ class IntelPackage(PackageBase):
# Intel MPI since 2019 depends on libfabric which is not in the
# lib directory but in a directory of its own which should be
# included in the rpath
- if self.version >= ver('2019'):
+ if self.version_yearlike >= ver('2019'):
d = ancestor(self.component_lib_dir('mpi'))
libfabrics_path = os.path.join(d, 'libfabric', 'lib')
env.append_path('SPACK_COMPILER_EXTRA_RPATHS',