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

Check for llvm-tools before install #109256

Merged
merged 1 commit into from
Mar 18, 2023
Merged

Conversation

chaitanyav
Copy link
Contributor

Fixes #108948
@jpalus Please review

@rustbot
Copy link
Collaborator

rustbot commented Mar 17, 2023

Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @albertlarsan68 (or someone else) soon.

Please see the contribution instructions for more information. Namely, in order to ensure the minimum review times lag, PR authors and assigned reviewers should ensure that the review label (S-waiting-on-review and S-waiting-on-author) stays updated, invoking these commands when appropriate:

  • @rustbot author: the review is finished, PR author should check the comments and take action accordingly
  • @rustbot review: the author is ready for a review, this PR will be queued again in the reviewer's queue

@rustbot rustbot added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) labels Mar 17, 2023
@albertlarsan68
Copy link
Member

Thanks for the PR!
@bors r+ rollup

@bors
Copy link
Contributor

bors commented Mar 17, 2023

📌 Commit 97740a6 has been approved by albertlarsan68

It is now in the queue for this repository.

@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 Mar 17, 2023
@jpalus
Copy link

jpalus commented Mar 17, 2023

Can't give much of a review but I can confirm this PR fixes #108948 and install skips llvm tools installation now:

Skipping LlvmTools (aarch64-unknown-linux-gnu): external LLVM                                  
skipping llvm-tools stage2 (aarch64-unknown-linux-gnu): external LLVM 

matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Mar 17, 2023
…san68

Check for llvm-tools before install

Fixes rust-lang#108948
`@jpalus` Please review
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Mar 17, 2023
…san68

Check for llvm-tools before install

Fixes rust-lang#108948
``@jpalus`` Please review
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Mar 17, 2023
…san68

Check for llvm-tools before install

Fixes rust-lang#108948
```@jpalus``` Please review
bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 18, 2023
…iaskrgr

Rollup of 9 pull requests

Successful merges:

 - rust-lang#109102 (Erase escaping late-bound regions when probing for ambiguous associated types)
 - rust-lang#109200 (Fix index out of bounds in `suggest_trait_fn_ty_for_impl_fn_infer`)
 - rust-lang#109211 (E0206 - update description )
 - rust-lang#109222 (Do not ICE for unexpected lifetime with ConstGeneric rib)
 - rust-lang#109235 (fallback to lstat when stat fails on Windows)
 - rust-lang#109248 (Pass the right HIR back from `get_fn_decl`)
 - rust-lang#109251 (Suggest surrounding the macro with `{}` to interpret as a statement)
 - rust-lang#109256 (Check for llvm-tools before install)
 - rust-lang#109257 (resolve: Improve debug impls for `NameBinding`)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 01edab6 into rust-lang:master Mar 18, 2023
@rustbot rustbot added this to the 1.70.0 milestone Mar 18, 2023
.ensure(dist::LlvmTools { target: self.target })
.expect("missing llvm-tools");
install_sh(builder, "llvm-tools", self.compiler.stage, Some(self.target), &tarball);
if let Some(tarball) = builder.ensure(dist::LlvmTools { target: self.target }) {
Copy link
Member

Choose a reason for hiding this comment

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

I don't think this approach was right.

See #109196 (comment)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

@ozkanonur Thank you for fixing.

wip-sync pushed a commit to NetBSD/pkgsrc-wip that referenced this pull request Mar 21, 2023
pld-gitsync pushed a commit to pld-linux/rust that referenced this pull request Apr 20, 2023
- use upstream fix for llvm tools install issue from:
  rust-lang/rust#109256
- rust analysis dropped upstream
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. 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.

rust 1.68.0 install fails with missing llvm-tools if using external llvm
6 participants