From 11097ec2e01c7f2b58677936b38fd587b69afc55 Mon Sep 17 00:00:00 2001
From: Cayetano Santos <csantosb@inventati.org>
Date: Sat, 24 Jan 2026 17:33:03 +0100
Subject: [PATCH] gnu: adaptivecpp: Fix rpath.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* gnu/packages/sycl.scm (adaptivecpp)[arguments]<#:phases>: Remove
’create-symlinks.
<#:configure-flags>: Remove default flag.

Change-Id: Ia8d9a87e46be22303ffca126dec733b7042ead9d
---
 gnu/packages/sycl.scm | 32 ++++----------------------------
 1 file changed, 4 insertions(+), 28 deletions(-)

diff --git a/gnu/packages/sycl.scm b/gnu/packages/sycl.scm
index 03e3abe252..7cd1fd6337 100644
--- a/gnu/packages/sycl.scm
+++ b/gnu/packages/sycl.scm
@@ -1,5 +1,6 @@
 ;;; GNU Guix --- Functional package management for GNU
 ;;; Copyright © 2023, 2024 Andy Tai <atai@atai.org>
+;;; Copyright © 2025, 2026 Cayetano Santos <csantosb@inventati.org>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -64,36 +65,11 @@
      (list
       #:configure-flags
       #~(list
-         "-DACPP_COMPILER_FEATURE_PROFILE=full"
+         (string-append "-DCMAKE_EXE_LINKER_FLAGS=" "-Wl,-rpath="
+                        #$output "/lib,-rpath="
+                        #$output "/lib/hipSYCL/llvm-to-backend")
          (string-append
           "-DACPP_LLD_PATH=" (search-input-file %build-inputs "/bin/ld.lld")))
-      #:phases
-      #~(modify-phases %standard-phases
-          ;; FIXME: There is probably a much better way.
-          ;; This file: bin/hipSYCL/llvm-to-backend/llvm-to-host-tool
-          ;; requires libacpp-common.so and libllvm-to-{backend,host}.so
-          ;; in RUNPATH
-          (add-before 'validate-runpath 'create-symlinks
-            (lambda _
-              (symlink
-               (string-append #$output "/lib/libacpp-common.so")
-               (string-append
-                #$output
-                "/bin/hipSYCL/llvm-to-backend/libacpp-common.so"))
-              (symlink
-               (string-append
-                #$output
-                "/lib/hipSYCL/llvm-to-backend/libllvm-to-backend.so")
-               (string-append
-                #$output
-                "/bin/hipSYCL/llvm-to-backend/libllvm-to-backend.so"))
-              (symlink
-               (string-append
-                #$output
-                "/lib/hipSYCL/llvm-to-backend/libllvm-to-host.so")
-               (string-append
-                #$output
-                "/bin/hipSYCL/llvm-to-backend/libllvm-to-host.so")))))
       #:tests? #f)) ; no tests
     (home-page "https://adaptivecpp.github.io/")
     (synopsis