diff options
| author | Orivej Desh <orivej@gmx.fr> | 2017-08-07 15:06:44 +0000 |
|---|---|---|
| committer | Robin Gloster <mail@glob.in> | 2017-08-08 11:03:51 +0200 |
| commit | c8f7f18e69c01907f52634bb6b926a99b030cb95 (patch) | |
| tree | b2abbab616d03fa7488d597e916393a6ecc4d46e /pkgs/build-support | |
| parent | 3e981b9e33141ec8bafd8ecf36cde9cbafaac180 (diff) | |
| download | nixlib-c8f7f18e69c01907f52634bb6b926a99b030cb95.tar nixlib-c8f7f18e69c01907f52634bb6b926a99b030cb95.tar.gz nixlib-c8f7f18e69c01907f52634bb6b926a99b030cb95.tar.bz2 nixlib-c8f7f18e69c01907f52634bb6b926a99b030cb95.tar.lz nixlib-c8f7f18e69c01907f52634bb6b926a99b030cb95.tar.xz nixlib-c8f7f18e69c01907f52634bb6b926a99b030cb95.tar.zst nixlib-c8f7f18e69c01907f52634bb6b926a99b030cb95.zip | |
cc-wrapper: Fix adding directories to rpath
This fixes a bug introduced in #27831: `for path in "$dir"/lib*.so` assumed that all libs match `lib*.so`, but 07674788d6932fe702117649b4cd16512d2da8a9 started adding libs that match `*.so` and `*.so.*`.
Diffstat (limited to 'pkgs/build-support')
| -rw-r--r-- | pkgs/build-support/cc-wrapper/ld-wrapper.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/build-support/cc-wrapper/ld-wrapper.sh b/pkgs/build-support/cc-wrapper/ld-wrapper.sh index e47a6bfec860..028f2d4f5484 100644 --- a/pkgs/build-support/cc-wrapper/ld-wrapper.sh +++ b/pkgs/build-support/cc-wrapper/ld-wrapper.sh @@ -129,7 +129,7 @@ if [ "$NIX_@infixSalt@_DONT_SET_RPATH" != 1 ]; then # copied to $out/lib. If not, we're screwed. continue fi - for path in "$dir"/lib*.so; do + for path in "$dir"/*; do file="${path##*/}" if [ "${libs[$file]:-}" ]; then libs["$file"]= |