From dd5c517757f97b68f7eb07628222c958b47f742b Mon Sep 17 00:00:00 2001
From: Henry Romp <151henry151@gmail.com>
Date: Tue, 23 Sep 2025 19:00:25 -0400
Subject: [PATCH] build: Move CMAKE_SKIP_RPATH from CMake to Guix script

Remove hardcoded CMAKE_SKIP_INSTALL_RPATH setting from CMakeLists.txt and add it as a CMake configuration option in the Guix build script. This makes the build system more portable by keeping build-environment-specific settings in the build scripts rather than hardcoded in the CMake configuration.

Changes:
- Remove set(CMAKE_SKIP_INSTALL_RPATH TRUE) from CMakeLists.txt
- Add -DCMAKE_SKIP_RPATH=TRUE to Guix build script CONFIGFLAGS

This addresses the feedback from hebasto in https://github.com/bitcoin/bitcoin/pull/33247#discussion_r2369869582
---
 CMakeLists.txt                | 1 -
 contrib/guix/libexec/build.sh | 2 +-
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 4c10fb73fad..c50e2f6d3f8 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -630,7 +630,6 @@ if(CMAKE_SYSTEM_NAME STREQUAL "NetBSD")
   set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
 else()
   set(CMAKE_SKIP_BUILD_RPATH TRUE)
-  set(CMAKE_SKIP_INSTALL_RPATH TRUE)
 endif()
 add_subdirectory(test)
 add_subdirectory(doc)
diff --git a/contrib/guix/libexec/build.sh b/contrib/guix/libexec/build.sh
index f23133fd584..e3d0ee78cd9 100755
--- a/contrib/guix/libexec/build.sh
+++ b/contrib/guix/libexec/build.sh
@@ -206,7 +206,7 @@ mkdir -p "$OUTDIR"
 ###########################
 
 # CONFIGFLAGS
-CONFIGFLAGS="-DREDUCE_EXPORTS=ON -DBUILD_BENCH=OFF -DBUILD_GUI_TESTS=OFF -DBUILD_FUZZ_BINARY=OFF"
+CONFIGFLAGS="-DREDUCE_EXPORTS=ON -DBUILD_BENCH=OFF -DBUILD_GUI_TESTS=OFF -DBUILD_FUZZ_BINARY=OFF -DCMAKE_SKIP_RPATH=TRUE"
 
 # CFLAGS
 HOST_CFLAGS="-O2 -g"