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

Respect NIX_DONT_SET_RPATH when .so appears in the command line

Browse Source 
Unified processing of command line arguments in ld-wrapper broke support for
`NIX_DONT_SET_RPATH` and revealed that ld-wrapper adds the directory of its
`-plugin` argument to runpath. This pull request fixes that. It treats
`dir/libname.so` as `-L dir -l name`, because this is how `ld.so` interprets
resulting binary: with `dir` in `RUNPATH` and the bare `libname.so` (without
`dir`) in `NEEDED`, it looks for `libname.so` in each `RUNPATH` and chooses the
first, even when the linker was invoked with an absolute path to `.so`.
This commit is contained in:
Orivej Desh 2017-08-01 08:27:50 +00:00 committed by Robin Gloster
parent 6341cc9101
commit 07674788d6
1 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -62,7 +62,6 @@ fi
extra+=($NIX_LDFLAGS_AFTER $NIX_LDFLAGS_HARDEN) extra+=($NIX_LDFLAGS_AFTER $NIX_LDFLAGS_HARDEN)
declare -A rpaths
declare -a libDirs declare -a libDirs
declare -A libs declare -A libs
relocatable= relocatable=
@ -78,9 +77,8 @@ if [ "$NIX_DONT_SET_RPATH" != 1 ] || [ "$NIX_SET_BUILD_ID" = 1 ]; then
-l) -l)
libs["lib${p}.so"]=1 libs["lib${p}.so"]=1
;; ;;
-dynamic-linker) -dynamic-linker | -plugin)
# Ignore the dynamic linker argument, or it # Ignore this argument, or it will match *.so and be added to rpath.
# will match *.so and be added to rpath.
;; ;;
*) *)
case "$p" in case "$p" in
@ -91,13 +89,9 @@ if [ "$NIX_DONT_SET_RPATH" != 1 ] || [ "$NIX_SET_BUILD_ID" = 1 ]; then
libs["lib${p:2}.so"]=1 libs["lib${p:2}.so"]=1
;; ;;
"$NIX_STORE"/*.so | "$NIX_STORE"/*.so.*) "$NIX_STORE"/*.so | "$NIX_STORE"/*.so.*)
# This is a direct reference to a shared library, so add # This is a direct reference to a shared library.
# its directory to the rpath. libDirs+=("${p%/*}")
dir="${p%/*}" libs["${p##*/}"]=1
if [ ! "${rpaths[$dir]}" ]; then
rpaths["$dir"]=1
extra+=(-rpath "$dir")
fi
;; ;;
-r | --relocatable | -i) -r | --relocatable | -i)
relocatable=1 relocatable=1
@ -116,6 +110,7 @@ if [ "$NIX_DONT_SET_RPATH" != 1 ]; then
# so, add the directory to the rpath. # so, add the directory to the rpath.
# It's important to add the rpath in the order of -L..., so # It's important to add the rpath in the order of -L..., so
# the link time chosen objects will be those of runtime linking. # the link time chosen objects will be those of runtime linking.
declare -A rpaths
for dir in "${libDirs[@]}"; do for dir in "${libDirs[@]}"; do
if [[ "$dir" =~ [/.][/.] ]] && dir2=$(readlink -f "$dir"); then if [[ "$dir" =~ [/.][/.] ]] && dir2=$(readlink -f "$dir"); then
dir="$dir2" dir="$dir2"