summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVictor Brunini <vebruni@sandia.gov>2024-01-04 18:33:15 -0800
committerGitHub <noreply@github.com>2024-01-04 19:33:15 -0700
commit0e698ff5c4c6a420bb9d2515672116c8de56585e (patch)
tree1cd807810bdf6e35a4700b1127c1f89ac46fb93f
parent533adaaa6d1ebea3b1e6d634d67e5185cea2fe95 (diff)
downloadspack-0e698ff5c4c6a420bb9d2515672116c8de56585e.tar.gz
spack-0e698ff5c4c6a420bb9d2515672116c8de56585e.tar.bz2
spack-0e698ff5c4c6a420bb9d2515672116c8de56585e.tar.xz
spack-0e698ff5c4c6a420bb9d2515672116c8de56585e.zip
intel-oneapi-mkl: Add correct PKG_CONFIG_PATH entry for older versions. (#41958)
At least 2021.3.0 puts the .pc files in tools/pkgconfig, not lib/pkgconfig.
-rw-r--r--var/spack/repos/builtin/packages/intel-oneapi-mkl/package.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/var/spack/repos/builtin/packages/intel-oneapi-mkl/package.py b/var/spack/repos/builtin/packages/intel-oneapi-mkl/package.py
index 12ba4f142a..6c1a28ef3f 100644
--- a/var/spack/repos/builtin/packages/intel-oneapi-mkl/package.py
+++ b/var/spack/repos/builtin/packages/intel-oneapi-mkl/package.py
@@ -158,7 +158,10 @@ class IntelOneapiMkl(IntelOneApiLibraryPackage):
# Only if environment modifications are desired (default is +envmods)
if self.spec.satisfies("+envmods"):
env.set("MKLROOT", self.component_prefix)
+ # 2023.1.0 has the pkgconfig files in lib/pkgconfig, 2021.3.0 has them in
+ # tools/pkgconfig, just including both in PKG_CONFIG_PATH
env.append_path("PKG_CONFIG_PATH", self.component_prefix.lib.pkgconfig)
+ env.append_path("PKG_CONFIG_PATH", self.component_prefix.tools.pkgconfig)
def _find_mkl_libs(self, shared):
libs = []