From c8f7f18e69c01907f52634bb6b926a99b030cb95 Mon Sep 17 00:00:00 2001 From: Orivej Desh Date: Mon, 7 Aug 2017 15:06:44 +0000 Subject: 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.*`. --- pkgs/build-support/cc-wrapper/ld-wrapper.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'pkgs/build-support') 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"]= -- cgit 1.4.1