Revert "Move llvm submodule updates to rustbuild" #85647
Merged
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
|
@Mark-Simulacrum: no appropriate reviewer found, use r? to override |
rust-highfive
added
the
S-waiting-on-review
|
r? @jyn514 |
jyn514
reviewed
May 24, 2021
| @@ -130,7 +130,6 @@ pub fn make(host: &str) -> PathBuf { | |||
| } | |||
| } | |||
|
|
|||
| #[track_caller] | |||
There was a problem hiding this comment.
Can you keep this commit? Other than that this looks good to me.
Comment on lines
-1004
to
-1007
| # { filename: hash } | ||
| recorded_submodules = {} | ||
| for data in recorded: | ||
| # [mode, kind, hash, filename] |
There was a problem hiding this comment.
Can you keep these added comments?
|
I'm going to go ahead and just approve -- I don't think the comments or track_caller is important enough to block this and I don't have a lot of time to do those edits. @bors r=jyn514 |
|
📌 Commit ad30826 has been approved by |
bors
added
S-waiting-on-bors
|
Another thing to consider when trying to re-land this is that it seems to ignore the |
JohnTitor
added a commit
to JohnTitor/rust
that referenced
this pull request
May 25, 2021
…nd, r=jyn514 Revert "Move llvm submodule updates to rustbuild" Reverts rust-lang#81601 This updates LLVM a bit too eagerly -- and particularly on Windows, this can be slow. See discussion on [Zulip]. [Zulip]: https://rust-lang.zulipchat.com/#narrow/stream/182449-t-compiler.2Fhelp/topic/x.2Epy.20always.20updates.20LLVM.20submodule
JohnTitor
added a commit
to JohnTitor/rust
that referenced
this pull request
May 26, 2021
…nd, r=jyn514 Revert "Move llvm submodule updates to rustbuild" Reverts rust-lang#81601 This updates LLVM a bit too eagerly -- and particularly on Windows, this can be slow. See discussion on [Zulip]. [Zulip]: https://rust-lang.zulipchat.com/#narrow/stream/182449-t-compiler.2Fhelp/topic/x.2Epy.20always.20updates.20LLVM.20submodule
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
May 26, 2021
Rollup of 12 pull requests Successful merges: - rust-lang#84048 (Avoid CJK legacy fonts in Windows) - rust-lang#85529 (doc: clarify Mutex::try_lock, etc. errors) - rust-lang#85590 (Fix bootstrap using host exe suffix for cargo) - rust-lang#85610 (Fix pointer provenance in <[T]>::copy_within) - rust-lang#85623 (Remove stray .stderr files) - rust-lang#85645 (Demote `ControlFlow::{from|into}_try` to `pub(crate)`) - rust-lang#85647 (Revert "Move llvm submodule updates to rustbuild") - rust-lang#85666 (Document shared_from_cow functions) - rust-lang#85668 (Fix tasklist example in rustdoc book.) - rust-lang#85672 (Move stability attribute for items under the `ip` feature) - rust-lang#85699 (Update books) - rust-lang#85701 (Update cargo) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Jun 25, 2021
Move LLVM submodule updates back to native.rs Time to find more bugs! The first commit is a straight revert of rust-lang#85647, the second is a fix for https://rust-lang.zulipchat.com/#narrow/stream/182449-t-compiler.2Fhelp/topic/x.2Epy.20always.20updates.20LLVM.20submodule/near/240113320 and rust-lang#82653 (comment). I haven't been able to replicate rust-lang#82653 (comment).
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.
Reverts #81601
This updates LLVM a bit too eagerly -- and particularly on Windows, this can be slow. See discussion on Zulip.