cmake/setup-hook.sh: Don't skip build-RPATH
This should simplify using `nix-shell -A` or `nix develop` to develop CMake based projects. CMake features a mechanism to use a different RPATH for all executables in the build directory and only rewrite these RPATHs on installation. This makes it possible to run executables already from the build directory without having to set LD_LIBRARY_PATH. This should simplify the checkPhase for cmake based projects and hopefully not break anything. Fixes: #22060
This commit is contained in:
parent
116e8e939b
commit
f7414e2b3a
|
@ -102,9 +102,8 @@ cmakeConfigurePhase() {
|
||||||
cmakeFlags="-DBUILD_TESTING=OFF $cmakeFlags"
|
cmakeFlags="-DBUILD_TESTING=OFF $cmakeFlags"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Avoid cmake resetting the rpath of binaries, on make install
|
# Always build Release, to ensure optimisation flags
|
||||||
# And build always Release, to ensure optimisation flags
|
cmakeFlags="-DCMAKE_BUILD_TYPE=${cmakeBuildType:-Release} $cmakeFlags"
|
||||||
cmakeFlags="-DCMAKE_BUILD_TYPE=${cmakeBuildType:-Release} -DCMAKE_SKIP_BUILD_RPATH=ON $cmakeFlags"
|
|
||||||
|
|
||||||
# Disable user package registry to avoid potential side effects
|
# Disable user package registry to avoid potential side effects
|
||||||
# and unecessary attempts to access non-existent home folder
|
# and unecessary attempts to access non-existent home folder
|
||||||
|
|
Loading…
Reference in a new issue