diff options
| -rw-r--r-- | var/spack/repos/builtin/packages/hip/package.py | 3 | ||||
| -rw-r--r-- | var/spack/repos/builtin/packages/llvm-amdgpu/package.py | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/var/spack/repos/builtin/packages/hip/package.py b/var/spack/repos/builtin/packages/hip/package.py index 6cc74196ac..70f46a5d73 100644 --- a/var/spack/repos/builtin/packages/hip/package.py +++ b/var/spack/repos/builtin/packages/hip/package.py @@ -359,6 +359,9 @@ class Hip(CMakePackage): if self.spec.satisfies("@5.7:"): paths["hip-path"] = rocm_prefix + if self.spec.satisfies("@6.0:"): + paths["hsa-rocr-dev"] = rocm_prefix + else: paths = { "hip-path": 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 0c9f5987a0..3ea4815451 100644 --- a/var/spack/repos/builtin/packages/llvm-amdgpu/package.py +++ b/var/spack/repos/builtin/packages/llvm-amdgpu/package.py @@ -274,12 +274,12 @@ class LlvmAmdgpu(CMakePackage, CompilerPackage): # 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") + env.prepend_path("LD_LIBRARY_PATH", llvm_amdgpu_home + "/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") + env.prepend_path("LD_LIBRARY_PATH", llvm_amdgpu_home + "/lib") # Required for enabling asan on dependent packages def setup_dependent_build_environment(self, env, dependent_spec): |