From 8cd9497522939222dc304ee3708fd3154154f67b Mon Sep 17 00:00:00 2001 From: Brian Van Essen Date: Sat, 5 Aug 2023 20:26:00 -0700 Subject: Bugfix spack module files (#39282) * Fixed the LD_LIBRARY_PATH to use the lib64 directory. * On AMD systems the llvm/lib directory is not properly put into the LD_LIBRARY_PATH. * Added both lib and lib64 paths for libfabric. * Split the prepend statements. --- var/spack/repos/builtin/packages/libfabric/package.py | 2 ++ var/spack/repos/builtin/packages/llvm-amdgpu/package.py | 10 ++++++++++ 2 files changed, 12 insertions(+) diff --git a/var/spack/repos/builtin/packages/libfabric/package.py b/var/spack/repos/builtin/packages/libfabric/package.py index 0c296736fb..db73e246df 100644 --- a/var/spack/repos/builtin/packages/libfabric/package.py +++ b/var/spack/repos/builtin/packages/libfabric/package.py @@ -157,11 +157,13 @@ class Libfabric(AutotoolsPackage): def setup_run_environment(self, env): libfabric_home = self.spec["libfabric"].prefix env.prepend_path("LD_LIBRARY_PATH", libfabric_home.lib) + env.prepend_path("LD_LIBRARY_PATH", libfabric_home.lib64) # To enable this package add it to the LD_LIBRARY_PATH def setup_dependent_run_environment(self, env, dependent_spec): libfabric_home = self.spec["libfabric"].prefix env.prepend_path("LD_LIBRARY_PATH", libfabric_home.lib) + env.prepend_path("LD_LIBRARY_PATH", libfabric_home.lib64) @when("@main") def autoreconf(self, spec, prefix): diff --git a/var/spack/repos/builtin/packages/llvm-amdgpu/package.py b/var/spack/repos/builtin/packages/llvm-amdgpu/package.py index 459d2fb40f..fef8e1f708 100644 --- a/var/spack/repos/builtin/packages/llvm-amdgpu/package.py +++ b/var/spack/repos/builtin/packages/llvm-amdgpu/package.py @@ -307,3 +307,13 @@ class LlvmAmdgpu(CMakePackage): int(match.group(1)), int(match.group(2)), int(match.group(3)) ) return detected_version + + # Make sure that the compiler paths are in the LD_LIBRARY_PATH + def setup_run_environment(self, env): + llvm_amdgpu_home = self.spec["llvm-amdgpu"].prefix + env.prepend_path("LD_LIBRARY_PATH", llvm_amdgpu_home + "/llvm/lib") + + # Make sure that the compiler paths are in the LD_LIBRARY_PATH + def setup_dependent_run_environment(self, env, dependent_spec): + llvm_amdgpu_home = self.spec["llvm-amdgpu"].prefix + env.prepend_path("LD_LIBRARY_PATH", llvm_amdgpu_home + "/llvm/lib") -- cgit v1.2.3-70-g09d2