nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-24 16:03:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

cc-wrapper: Fix support for qtbase-setup-hook

Browse Source 
Revert https://github.com/NixOS/nixpkgs/pull/27657#issuecomment-318161946
due to https://github.com/NixOS/nixpkgs/pull/28021#issuecomment-321045542
This commit is contained in:
Orivej Desh 2017-08-09 09:02:55 +00:00 committed by Robin Gloster
parent 25c12d0abf
commit 771f28bac8
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/build-support/cc-wrapper/ld-wrapper.sh
View File

@ -132,11 +132,14 @@ if [ "$NIX_@infixSalt@_DONT_SET_RPATH" != 1 ]; then
for path in "$dir"/*; do for path in "$dir"/*; do
file="${path##*/}" file="${path##*/}"
if [ "${libs[$file]:-}" ]; then if [ "${libs[$file]:-}" ]; then
libs["$file"]= # This library may have been provided by a previous directory,
if [ -z "${rpaths[$dir]:-}" ]; then # but if that library file is inside an output of the current
rpaths["$dir"]=1 # derivation, it can be deleted after this compilation and
extraAfter+=(-rpath "$dir") # should be found in a later directory, so we add all
fi # directories that contain any of the libraries to rpath.
rpaths["$dir"]=1
extraAfter+=(-rpath "$dir")
break
fi fi
done done
done done