From ee27dc5d45ba3b83f0c61ed2e60361089e311928 Mon Sep 17 00:00:00 2001
From: renjithravindrankannath
 <94420380+renjithravindrankannath@users.noreply.github.com>
Date: Wed, 28 Aug 2024 11:26:05 -0700
Subject: [PATCH] llvm-amdgpu: Updating LD_LIBRARY_PATH w.r.t new prefix path
 (#45940)

* Updating LD_LIBRARY_PATH w.r.t new prefix path

* Updating hsa external path for 6.x
---
 var/spack/repos/builtin/packages/hip/package.py         | 3 +++
 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 6cc74196acc..70f46a5d730 100644
--- a/var/spack/repos/builtin/packages/hip/package.py
+++ b/var/spack/repos/builtin/packages/hip/package.py
@@ -359,6 +359,9 @@ def get_paths(self):
 
             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 0c9f5987a05..3ea48154516 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 @@ def cmake_args(self):
     # 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):