Add support for --bindir and remember the relative locations of bindir and libdir vs prefix (ie: sysroot) #19065
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
Without this make fails due to not finding a way to create the bindir target.
If the expected rustc snapshot is not where we expect it to be, complain and fail at that point rather than creating a empty rustc file and continuing until we try to run it.
Without this, if we we're using a non-standard host libdir, the target bindir would not exist (and rustc would fail to write to the non-existent directory).
…an calculate it properly
codyps
force-pushed
the
bindir-libdir
branch
from
0285e9e to
370101c
Compare
|
Updated to fix some issues I ran into while testing with: |
|
This PR seems closely related to #16552, just something to keep in mind. |
| @@ -340,6 +340,7 @@ need_cmd date | |||
| need_cmd tr | |||
| need_cmd sed | |||
| need_cmd file | |||
| need_cmd realpath | |||
There was a problem hiding this comment.
Both my linux machine and my OSX machine don't have this command, so it may not be common enough to require. There are some snippets in #16552 which may be useful, however.
There was a problem hiding this comment.
Ok, I'll look into alternatives to calculate the relative paths.
|
Thanks for the pointer, I'll keep an eye on #16552 |
|
Closing due to inactivity, but feel free to reopen with a rebase! |
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.
Potential downsides:
realpath, which I'm not sure everyone has, to determine relative directories. It's possible we could substitute something else if this matters.Upsides:
--libdirnow avoids breaking things at runtime if it isn't in one of the expected locations