Update dtk25.04.4.yaml

envs/dtk25.04.4.yaml

@@ -8,6 +8,7 @@ env_vars:
   - LIBRARY_PATH
   - CPATH
   - PYTHONPATH
+  - PKG_CONFIG_PATH
   - UCX_HOME
   set:
     LD_LIBRARY_PATH: /opt/hyhal/lib:/opt/hyhal/lib64
@@ -21,6 +22,13 @@ toolchains:
     when: '%cxx'
   - spec: '%fortran=gcc'
     when: '%fortran'
+  llvm_all:
+  - spec: '%c=llvm'
+    when: '%c'
+  - spec: '%cxx=llvm'
+    when: '%cxx'
+  - spec: '%fortran=llvm'
+    when: '%fortran'
   gcc_all:
   - spec: '%c=gcc'
     when: '%c'
@@ -78,8 +86,8 @@ packages:
           cxx: /opt/dtk/llvm/bin/clang++
           fortran: /opt/dtk/llvm/bin/flang
         extra_rpaths:
-        - /opt/dtk/lib
-        - /opt/dtk/lib64
+        - /opt/dtk/llvm/lib
+        - /opt/dtk/llvm/lib64
   llvm-amdgpu:
     buildable: false
     externals:
@@ -87,8 +95,8 @@ packages:
       prefix: /opt/dtk/llvm
       extra_attributes:
         compilers:
-          c: /opt/dtk/llvm/bin/amdclang
-          cxx: /opt/dtk/llvm/bin/amdclang++
+          c: /opt/dtk/llvm/bin/clang
+          cxx: /opt/dtk/llvm/bin/clang++
         extra_rpaths:
         - /opt/dtk/lib
         - /opt/dtk/lib64
@@ -97,6 +105,11 @@ packages:
     externals:
     - spec: hip@5.7.0 amdgpu_target:=gfx936
       prefix: /opt/dtk/hip
+      extra_attributes:
+        compilers:
+          c: /opt/dtk/llvm/bin/clang
+          cxx: /opt/dtk/llvm/bin/clang++
+          hip: /opt/rocm/hip/bin/hipcc
   rocm-core:
     buildable: false
     externals:
@@ -116,7 +129,11 @@ packages:
     buildable: false
     externals:
     - spec: hsa-rocr-dev@5.7.0 amdgpu_target:=gfx936
-      prefix: /opt/dtk/hsa
+      prefix: /opt/dtk
+      extra_attributes:
+        compilers:
+          c: /opt/dtk/llvm/bin/clang
+          cxx: /opt/dtk/llvm/bin/clang++
   hsakmt-roct:
     buildable: false
     externals: