rustbuild: allow configuring llvm version suffix#53987
Merged
bors merged 1 commit intorust-lang:masterfrom Sep 8, 2018
Merged
Conversation
Contributor
|
(rust_highfive has picked a reviewer for you, use r? to override) |
Member
|
@bors: r+ rollup |
Collaborator
|
📌 Commit 24403a85fdcd9822ef5c0fecf4b0c4b4fd03cdd3 has been approved by |
Collaborator
|
☔ The latest upstream changes (presumably #54021) made this pull request unmergeable. Please resolve the merge conflicts. |
Signed-off-by: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
Member
|
@bors r=alexcrichton |
Collaborator
|
📌 Commit ef44068 has been approved by |
Contributor
|
I wonder how this will interact with the recent |
kennytm
added a commit
to kennytm/rust
that referenced
this pull request
Sep 7, 2018
rustbuild: allow configuring llvm version suffix Fixes rust-lang#53852 by allowing user to install different versions of rust to the same sysroot.
kennytm
added a commit
to kennytm/rust
that referenced
this pull request
Sep 8, 2018
rustbuild: allow configuring llvm version suffix Fixes rust-lang#53852 by allowing user to install different versions of rust to the same sysroot.
bors
added a commit
that referenced
this pull request
Sep 8, 2018
Rollup of 11 pull requests Successful merges: - #51366 (stabilize #[panic_handler]) - #53162 (rustdoc: collect trait impls as an early pass) - #53932 ([NLL] Remove base_place) - #53942 (Rewrite `precompute_borrows_out_of_scope` for fewer hash table lookups.) - #53973 (Have rust-lldb look for the rust-enabled lldb) - #53981 (Implement initializer() for FileDesc) - #53987 (rustbuild: allow configuring llvm version suffix) - #53993 (rustc_resolve: don't record uniform_paths canaries as reexports.) - #54007 (crates that provide a `panic_handler` are exempt from the `unused_extern_crates` lint) - #54040 (update books for next release) - #54050 (Update `petgraph` dependency to 0.4.13 to fix build with nightly) Failed merges: r? @ghost
kennytm
added a commit
to kennytm/rust
that referenced
this pull request
Sep 8, 2018
rustbuild: allow configuring llvm version suffix Fixes rust-lang#53852 by allowing user to install different versions of rust to the same sysroot.
bors
added a commit
that referenced
this pull request
Sep 8, 2018
Rollup of 10 pull requests Successful merges: - #53315 (use `NonZeroU32` in `newtype_index!`macro, change syntax) - #53932 ([NLL] Remove base_place) - #53942 (Rewrite `precompute_borrows_out_of_scope` for fewer hash table lookups.) - #53973 (Have rust-lldb look for the rust-enabled lldb) - #53981 (Implement initializer() for FileDesc) - #53987 (rustbuild: allow configuring llvm version suffix) - #53993 (rustc_resolve: don't record uniform_paths canaries as reexports.) - #54007 (crates that provide a `panic_handler` are exempt from the `unused_extern_crates` lint) - #54040 (update books for next release) - #54050 (Update `petgraph` dependency to 0.4.13 to fix build with nightly)
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
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.
Fixes #53852 by allowing user to install different versions of rust to the same sysroot.