From dc8626b801daae79301b2906f88d49e2e3050be0 Mon Sep 17 00:00:00 2001 From: Dominik Gresch Date: Sat, 12 Jun 2021 12:02:56 +0200 Subject: 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 '.YYYY.Nupdate', due to the leading ''. --- lib/spack/spack/build_systems/intel.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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', -- cgit v1.2.3-70-g09d2