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

Move LLVM submodule updates back to native.rs #86015

Merged
merged 4 commits into from
Jun 26, 2021

Conversation

jyn514
Copy link
Member

@jyn514 jyn514 commented Jun 5, 2021

Time to find more bugs!

The first commit is a straight revert of #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 #82653 (comment). I haven't been able to replicate #82653 (comment).

@jyn514 jyn514 added A-LLVM Area: Code generation parts specific to LLVM. Both correctness bugs and optimization-related issues. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) labels Jun 5, 2021
@rust-highfive
Copy link
Collaborator

r? @Mark-Simulacrum

(rust-highfive has picked a reviewer for you, 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 Jun 5, 2021
@rust-log-analyzer

This comment has been minimized.

src/bootstrap/native.rs Outdated Show resolved Hide resolved
It was a trivial function only used once.
@Mark-Simulacrum
Copy link
Member

Seems OK -- r=me, but I would prefer to land this when you have some cycles to either revert it or fix bugs that may pop up. Obviously, you know better than I when that is :)

@Mark-Simulacrum Mark-Simulacrum added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels Jun 20, 2021
@jyn514
Copy link
Member Author

jyn514 commented Jun 20, 2021

Thanks :) I should have time this Friday afternoon

@jyn514
Copy link
Member Author

jyn514 commented Jun 25, 2021

@bors r=Mark-Simulacrum

@bors
Copy link
Contributor

bors commented Jun 25, 2021

📌 Commit 73a40ac has been approved by Mark-Simulacrum

@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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Jun 25, 2021
@bors
Copy link
Contributor

bors commented Jun 25, 2021

⌛ Testing commit 73a40ac with merge dd1525a...

@bors
Copy link
Contributor

bors commented Jun 26, 2021

☀️ Test successful - checks-actions
Approved by: Mark-Simulacrum
Pushing dd1525a to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jun 26, 2021
@bors bors merged commit dd1525a into rust-lang:master Jun 26, 2021
@rustbot rustbot added this to the 1.55.0 milestone Jun 26, 2021
@jyn514 jyn514 deleted the revert-revert branch June 26, 2021 02:29
@durin42
Copy link
Contributor

durin42 commented Jul 7, 2021

FWIW, this appears to have the same behavior mentioned in #85647 that it unconditionally updates LLVM even if [build] submodules = false is specified. I'm not sure if that's intentional, but it'd be nice to have a way to have LLVM not get updated when doing builds. Should I file a bug?

@jyn514
Copy link
Member Author

jyn514 commented Jul 7, 2021

FWIW, this appears to have the same behavior mentioned in #85647 that it unconditionally updates LLVM even if [build] submodules = false is specified. I'm not sure if that's intentional, but it'd be nice to have a way to have LLVM not get updated when doing builds. Should I file a bug?

Yes, please do. Thanks!

@durin42
Copy link
Contributor

durin42 commented Jul 7, 2021

Filed #86954, thanks!

bors added a commit to rust-lang-ci/rust that referenced this pull request Jul 21, 2021
…imulacrum

Update all submodules that rustbuild doesn't depend on lazily

This only updates the submodules the first time they're needed, instead
of unconditionally the first time you run x.py.

Ideally, this would move *all* submodules to rustbuild and not exclude some tools and
backtrace. Unfortunately, cargo requires all `Cargo.toml` files in the
whole workspace to be present to build any crate.

On my machine, this takes the time for an initial submodule clone (for
`x.py --help`) from 55.70 to 15.87 seconds.

Helps with rust-lang#76653. Builds on rust-lang#86015 and should not be merged before (only the last commit is relevant).
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
A-LLVM Area: Code generation parts specific to LLVM. Both correctness bugs and optimization-related issues. merged-by-bors This PR was explicitly merged by bors. S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap)
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants