ld-wrapper: Fix adding directories to rpath #28012
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This fixes a bug introduced in NixOS#27831: `for path in "$dir"/lib*.so` assumed that all libs match `lib*.so`, but 0767478 started adding libs that match `*.so` and `*.so.*`.
|
@orivej, thanks for your PR! By analyzing the history of the files in this pull request, we identified @edolstra, @Ericson2314 and @vcunat to be potential reviewers. |
|
I'm currently testing if this is enough, don't want to have hydra build another not-too-useful staging |
Ericson2314
approved these changes
Aug 7, 2017
| @@ -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 | |||
There was a problem hiding this comment.
Any reason you didn't do `.so? I don't care either way.
There was a problem hiding this comment.
*.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.
There was a problem hiding this comment.
Also, it occurred to me that * is probably faster anyways.
LnL7
approved these changes
Aug 7, 2017
|
This was merged in #28021 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This fixes a bug introduced in #27831:
for path in "$dir"/lib*.soassumed that all libs matchlib*.so, but 0767478 started adding libs that match*.soand*.so.*.Reported by @globin at #27657 (comment)