From 7f312e4d7ec89f9fa4966b3a33c19b66376c59e3 Mon Sep 17 00:00:00 2001
From: Henry Romp <151henry151@gmail.com>
Date: Sat, 23 Aug 2025 17:19:14 -0400
Subject: [PATCH] build: Remove deprecated CMAKE_SKIP_BUILD_RPATH and
 SKIP_BUILD_RPATH settings

Remove deprecated CMake settings that are no longer needed after
reordering Guix script commands to perform binary checks after the
installation step.

Changes:
- Remove CMAKE_SKIP_BUILD_RPATH TRUE setting from main CMakeLists.txt
- Remove SKIP_BUILD_RPATH OFF property setting from src/CMakeLists.txt
- Update TODO comments to reflect that these settings have been removed

The NetBSD-specific logic for CMAKE_INSTALL_RPATH_USE_LINK_PATH is
preserved as it's still needed for that platform.

This addresses the TODO items mentioned in:
- CMakeLists.txt:620
- src/CMakeLists.txt:412

Relevant discussions:
- https://github.com/hebasto/bitcoin/pull/236#issuecomment-2183120953
- https://github.com/bitcoin/bitcoin/pull/30312#issuecomment-2191235833
---
 CMakeLists.txt     | 7 +++----
 src/CMakeLists.txt | 7 +++----
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 74ccdb02182b..4a6f1e62dad9 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -618,9 +618,9 @@ if(CMAKE_VERSION VERSION_GREATER_EQUAL 3.29)
   set(CMAKE_SKIP_TEST_ALL_DEPENDENCY FALSE)
 endif()
 
-# TODO: The `CMAKE_SKIP_BUILD_RPATH` variable setting can be deleted
-#       in the future after reordering Guix script commands to
-#       perform binary checks after the installation step.
+# TODO: The `CMAKE_SKIP_BUILD_RPATH` variable setting has been removed
+#       after reordering Guix script commands to perform binary checks
+#       after the installation step.
 # Relevant discussions:
 # - https://github.com/hebasto/bitcoin/pull/236#issuecomment-2183120953
 # - https://github.com/bitcoin/bitcoin/pull/30312#issuecomment-2191235833
@@ -628,7 +628,6 @@ endif()
 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)
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index a6fb12c00975..79c54c3afb06 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -410,14 +410,13 @@ if(BUILD_UTIL_CHAINSTATE)
   add_executable(bitcoin-chainstate
     bitcoin-chainstate.cpp
   )
-  # TODO: The `SKIP_BUILD_RPATH` property setting can be deleted
-  #       in the future after reordering Guix script commands to
-  #       perform binary checks after the installation step.
+  # TODO: The `SKIP_BUILD_RPATH` property setting has been removed
+  #       after reordering Guix script commands to perform binary checks
+  #       after the installation step.
   # Relevant discussions:
   # - https://github.com/hebasto/bitcoin/pull/236#issuecomment-2183120953
   # - https://github.com/bitcoin/bitcoin/pull/30312#issuecomment-2191235833
   set_target_properties(bitcoin-chainstate PROPERTIES
-    SKIP_BUILD_RPATH OFF
   )
   target_link_libraries(bitcoin-chainstate
     PRIVATE