laantungir
/
bitcoin
mirror of https://github.com/bitcoin/bitcoin.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
This commit is contained in:
Henry Romp 2025-09-23 19:00:25 -04:00
parent ad4a49090d
commit dd5c517757
2 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

@ -630,7 +630,6 @@ if(CMAKE_SYSTEM_NAME STREQUAL "NetBSD")
set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE) set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
else() else()
set(CMAKE_SKIP_BUILD_RPATH TRUE) set(CMAKE_SKIP_BUILD_RPATH TRUE)
set(CMAKE_SKIP_INSTALL_RPATH TRUE)
endif() endif()
add_subdirectory(test) add_subdirectory(test)
add_subdirectory(doc) add_subdirectory(doc)

2
contrib/guix/libexec/build.sh
View File

@ -206,7 +206,7 @@ mkdir -p "$OUTDIR"
########################### ###########################
# CONFIGFLAGS # 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 # CFLAGS
HOST_CFLAGS="-O2 -g" HOST_CFLAGS="-O2 -g"