gnu: rocm-hipcc: `hipconfig' `--check' failing.

* gnu/packages/llvm.scm (rocm-hipcc): `hipconfig' `--check' failing.

Change-Id: I78c4db69c3015f1cee3c2db60554dfbbc7100527
Signed-off-by: Ludovic Courtès <ludo@gnu.org>

1 files changed, 5 insertions, 2 deletions

diff --git a/gnu/packages/llvm.scm b/gnu/packages/llvm.scm
index 9e265ae7eb2..8742abce0b5 100644
--- a/gnu/packages/llvm.scm
+++ b/gnu/packages/llvm.scm
@@ -1576,13 +1576,16 @@ AMDGPU code objects.")
           (add-after 'unpack 'chdir
             (lambda _
               (chdir "amd/hipcc")))
-          (add-after 'chdir 'patch-rocm-path
+          (add-after 'chdir 'patch-paths
             (lambda* (#:key inputs #:allow-other-keys)
               (substitute* (find-files "src" "\\.h$")
                 (("roccmPath \\+ \"/bin/rocm_agent_enumerator\"")
                  (format #f "~s" (search-input-file
                                   inputs
-                                  "/bin/rocm_agent_enumerator"))))))
+                                  "/bin/rocm_agent_enumerator"))))
+              (substitute* "src/hipBin_amd.h"
+                (("which hipconfig")
+                 (string-append #$(file-append which "/bin/which") " hipconfig")))))
           ;; This version file very important, as it is parsed under
           ;; $#{llvm-rocm}/clang/lib/Driver/ToolChains/AMDGPU.cpp and its
           ;; contents decides on some includes for hipcc.