Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

ld-wrapper: Fix adding directories to rpath #28012

Closed
wants to merge 1 commit into from
Closed

ld-wrapper: Fix adding directories to rpath #28012

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pkgs/build-support/cc-wrapper/ld-wrapper.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Any reason you didn't do `.so? I don't care either way.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

*.so* would work, but I do not want to remember or force others to keep in mind that this wildcard should be wider than anything that goes in libs.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also, it occurred to me that * is probably faster anyways.

file="${path##*/}"
if [ "${libs[$file]:-}" ]; then
libs["$file"]=
Expand Down