public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cmake: use supplied RPATH instead of guessing

Browse Source
This commit is contained in:
Thomas Tuegel 2016-05-31 06:26:22 -05:00
parent 926c9293cb
commit 8ec5adc953
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/development/tools/build-managers/cmake/setup-hook.sh
View File

@ -47,9 +47,15 @@ cmakeConfigurePhase() {
cmakeFlags="-DCMAKE_INSTALL_LIBDIR=${!outputLib}/lib $cmakeFlags" cmakeFlags="-DCMAKE_INSTALL_LIBDIR=${!outputLib}/lib $cmakeFlags"
cmakeFlags="-DCMAKE_INSTALL_INCLUDEDIR=${!outputDev}/include $cmakeFlags" cmakeFlags="-DCMAKE_INSTALL_INCLUDEDIR=${!outputDev}/include $cmakeFlags"
# 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=Release $cmakeFlags"
cmakeFlags="-DCMAKE_BUILD_TYPE=Release -DCMAKE_SKIP_BUILD_RPATH=ON $cmakeFlags" # Do not change the RPATH between build and install, simply
# build with the correct RPATH in the first place.
cmakeFlags="-DCMAKE_BUILD_WITH_INSTALL_RPATH=TRUE $cmakeFlags"
# Do not try to guess the correct RPATH based on linker flags.
cmakeFlags="-DCMAKE_INSTALL_RPATH_USE_LINK_PATH=FALSE $cmakeFlags"
# Just use exactly our RPATH.
cmakeFlags="-DCMAKE_INSTALL_RPATH=$CMAKE_INSTALL_RPATH $cmakeFlags"
echo "cmake flags: $cmakeFlags ${cmakeFlagsArray[@]}" echo "cmake flags: $cmakeFlags ${cmakeFlagsArray[@]}"
@ -77,6 +83,7 @@ makeCmakeFindLibs(){
;; ;;
-L*) -L*)
export CMAKE_LIBRARY_PATH="$CMAKE_LIBRARY_PATH${CMAKE_LIBRARY_PATH:+:}${flag:2}" export CMAKE_LIBRARY_PATH="$CMAKE_LIBRARY_PATH${CMAKE_LIBRARY_PATH:+:}${flag:2}"
export CMAKE_INSTALL_RPATH="$CMAKE_INSTALL_RPATH${CMAKE_INSTALL_RPATH:+:}${flag:2}"
;; ;;
esac esac
done done