Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert "Move llvm submodule updates to rustbuild" #85647

Merged
merged 1 commit into from
May 26, 2021

Conversation

Mark-Simulacrum
Copy link
Member

Reverts #81601

This updates LLVM a bit too eagerly -- and particularly on Windows, this can be slow. See discussion on Zulip.

@rust-highfive
Copy link
Collaborator

@Mark-Simulacrum: no appropriate reviewer found, use r? to override

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label May 24, 2021
@Mark-Simulacrum
Copy link
Member Author

r? @jyn514

@@ -130,7 +130,6 @@ pub fn make(host: &str) -> PathBuf {
}
}

#[track_caller]
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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]
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you keep these added comments?

@Mark-Simulacrum
Copy link
Member Author

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

@bors
Copy link
Contributor

bors commented May 24, 2021

📌 Commit ad30826 has been approved by jyn514

@bors bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels May 24, 2021
@ehuss
Copy link
Contributor

ehuss commented May 25, 2021

Another thing to consider when trying to re-land this is that it seems to ignore the build.submodules config setting. Forcibly updating submodules is a destructive operation, and any changes in those directories get lost.

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 bors merged commit 7508203 into master May 26, 2021
@bors bors deleted the revert-81601-llvm-on-demand branch May 26, 2021 09:52
@rustbot rustbot added this to the 1.54.0 milestone May 26, 2021
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
Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants