Skip to content

Commit 4b41f99

Browse files
committed
build: Move CMAKE_SKIP_INSTALL_RPATH from CMake to Guix script
Remove CMAKE_SKIP_INSTALL_RPATH from CMakeLists.txt and add CMAKE_SKIP_RPATH to the Guix build script. This keeps build-environment-specific settings in the build scripts rather than hardcoded in the CMake configuration.
1 parent ad4a490 commit 4b41f99

File tree

2 files changed

+1
-2
lines changed

2 files changed

+1
-2
lines changed

CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -630,7 +630,6 @@ if(CMAKE_SYSTEM_NAME STREQUAL "NetBSD")
630630
set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
631631
else()
632632
set(CMAKE_SKIP_BUILD_RPATH TRUE)
633-
set(CMAKE_SKIP_INSTALL_RPATH TRUE)
634633
endif()
635634
add_subdirectory(test)
636635
add_subdirectory(doc)

contrib/guix/libexec/build.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -206,7 +206,7 @@ mkdir -p "$OUTDIR"
206206
###########################
207207

208208
# CONFIGFLAGS
209-
CONFIGFLAGS="-DREDUCE_EXPORTS=ON -DBUILD_BENCH=OFF -DBUILD_GUI_TESTS=OFF -DBUILD_FUZZ_BINARY=OFF"
209+
CONFIGFLAGS="-DREDUCE_EXPORTS=ON -DBUILD_BENCH=OFF -DBUILD_GUI_TESTS=OFF -DBUILD_FUZZ_BINARY=OFF -DCMAKE_SKIP_RPATH=TRUE"
210210

211211
# CFLAGS
212212
HOST_CFLAGS="-O2 -g"

0 commit comments

Comments
 (0)