summaryrefslogtreecommitdiff
path: root/var
diff options
context:
space:
mode:
authorBrian Van Essen <vanessen1@llnl.gov>2023-08-05 20:26:00 -0700
committerGitHub <noreply@github.com>2023-08-05 20:26:00 -0700
commit8cd9497522939222dc304ee3708fd3154154f67b (patch)
treef38399b83cfe42291e798f57830ddef305d208cc /var
parentef544a3b6d695104ce67cb9d2b0ff0e776aa1b46 (diff)
downloadspack-8cd9497522939222dc304ee3708fd3154154f67b.tar.gz
spack-8cd9497522939222dc304ee3708fd3154154f67b.tar.bz2
spack-8cd9497522939222dc304ee3708fd3154154f67b.tar.xz
spack-8cd9497522939222dc304ee3708fd3154154f67b.zip
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.
Diffstat (limited to 'var')
-rw-r--r--var/spack/repos/builtin/packages/libfabric/package.py2
-rw-r--r--var/spack/repos/builtin/packages/llvm-amdgpu/package.py10
2 files changed, 12 insertions, 0 deletions
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")