rustbuild: Restore Config.libdir_relative#48362
Merged
bors merged 2 commits intorust-lang:masterfrom Feb 25, 2018
Merged
Conversation
This re-introduces a `Config.libdir_relative` field, now derived from `libdir` and made relative to `prefix` if necessary. This fixes a regression from rust-lang#46592 when `--libdir` is given an absolute path. `Builder::sysroot_libdir` should always use a relative path so its callers don't clobber system locations, and `librustc` also asserts that `CFG_LIBDIR_RELATIVE` is really relative.
Contributor
|
(rust_highfive has picked a reviewer for you, use r? to override) |
rust-highfive
added
the
S-waiting-on-review
Member
|
Hm, so I think this is fine in general, but could we make |
Member
Author
|
OK, it's now a method. Can we also nominate this for beta? |
Mark-Simulacrum
added
beta-nominated
Member
|
@bors r+ I've accepted for beta backport. |
Collaborator
|
📌 Commit 8174c0d has been approved by |
bors
added
S-waiting-on-bors
Member
Author
|
Thanks! |
kennytm
added a commit
to kennytm/rust
that referenced
this pull request
Feb 25, 2018
…ulacrum rustbuild: Restore Config.libdir_relative This re-introduces a `Config.libdir_relative` field, now derived from `libdir` and made relative to `prefix` if necessary. This fixes a regression from rust-lang#46592 when `--libdir` is given an absolute path. `Builder::sysroot_libdir` should always use a relative path so its callers don't clobber system locations, and `librustc` also asserts that `CFG_LIBDIR_RELATIVE` is really relative.
bors
added a commit
that referenced
this pull request
Feb 25, 2018
kennytm
removed
the
beta-nominated
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
6 participants
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 re-introduces a
Config.libdir_relativefield, now derived fromlibdirand made relative toprefixif necessary.This fixes a regression from #46592 when
--libdiris given an absolutepath.
Builder::sysroot_libdirshould always use a relative path soits callers don't clobber system locations, and
librustcalso assertsthat
CFG_LIBDIR_RELATIVEis really relative.