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.

Sign up for GitHub

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

Jump to bottom

Fix x check --stage 1 when download-ci-llvm=false #110122

Merged
merged 2 commits into from
Apr 13, 2023
Merged

Fix x check --stage 1 when download-ci-llvm=false #110122

merged 2 commits into from
Apr 13, 2023

Conversation

jyn514
Copy link
Member

@jyn514 jyn514 commented Apr 9, 2023 •
edited
Loading

Bootstrap tries to avoid building LLVM unless it needs to; in particular we only build it for x build, not x check. Unfortunately, the check forgot about existence of stages - it would break if you used x check --stage 1:

  = note: /usr/bin/ld: cannot find -lPolly: No such file or directory
          /usr/bin/ld: cannot find -lPollyISL: No such file or directory

Fix it to work for stage 1.

I recommend reading this commit-by-commit; the first one makes a bunch of whitespace changes but otherwise doesn't change the logic.

@rustbot
Copy link
Collaborator

rustbot commented Apr 9, 2023

r? @ozkanonur

(rustbot has picked a reviewer for you, use r? to override)

@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 Apr 9, 2023
onur-ozkan
onur-ozkan approved these changes Apr 10, 2023
View reviewed changes
Copy link
Member

@onur-ozkan onur-ozkan left a comment

Choose a reason for hiding this comment

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

I like you seperated good amount of code block into rustc_llvm_env.

I have one non-blocker suggestion, other than that LGTM. Feel free to queue the PR with r=me. Taking or ignoring the suggestion is up to you since it's not a blocker.

src/bootstrap/compile.rs Outdated Show resolved Hide resolved
@jyn514
Copy link
Member Author

jyn514 commented Apr 11, 2023

@bors r=ozkanonur

@bors
Copy link
Contributor

bors commented Apr 11, 2023

📌 Commit ca3daa0 has been approved by ozkanonur

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 Apr 11, 2023
compiler-errors added a commit to compiler-errors/rust that referenced this pull request Apr 11, 2023
@compiler-errors
Rollup merge of rust-lang#110122 - jyn514:check-stage1-llvm, r=ozkanonur
cd2044f 
Fix x check --stage 1 when download-ci-llvm=false

Bootstrap tries to avoid building LLVM unless it needs to; in particular we only build it for `x build`, not `x check`. Unfortunately, the check forgot about existence of stages - it would break if you used `x check --stage 1`:
```
  = note: /usr/bin/ld: cannot find -lPolly: No such file or directory
          /usr/bin/ld: cannot find -lPollyISL: No such file or directory
```
Fix it to work for stage 1.

I recommend reading this commit-by-commit; the first one makes a bunch of whitespace changes but otherwise doesn't change the logic.
@compiler-errors compiler-errors mentioned this pull request Apr 11, 2023
Closed
compiler-errors added a commit to compiler-errors/rust that referenced this pull request Apr 12, 2023
@compiler-errors
Rollup merge of rust-lang#110122 - jyn514:check-stage1-llvm, r=ozkanonur
1d6a85f 
Fix x check --stage 1 when download-ci-llvm=false

Bootstrap tries to avoid building LLVM unless it needs to; in particular we only build it for `x build`, not `x check`. Unfortunately, the check forgot about existence of stages - it would break if you used `x check --stage 1`:
```
  = note: /usr/bin/ld: cannot find -lPolly: No such file or directory
          /usr/bin/ld: cannot find -lPollyISL: No such file or directory
```
Fix it to work for stage 1.

I recommend reading this commit-by-commit; the first one makes a bunch of whitespace changes but otherwise doesn't change the logic.
@compiler-errors compiler-errors mentioned this pull request Apr 12, 2023
Closed
@matthiaskrgr matthiaskrgr mentioned this pull request Apr 12, 2023
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Apr 12, 2023
@bors
Auto merge of rust-lang#110252 - matthiaskrgr:rollup-ovaixra, r=matth…
9693b17 
…iaskrgr

Rollup of 8 pull requests

Successful merges:

 - rust-lang#109810 (Replace rustdoc-ui/{c,z}-help tests with a stable run-make test )
 - rust-lang#110035 (fix: ensure bad `#[test]` invocs retain correct AST)
 - rust-lang#110089 (sync::mpsc: synchronize receiver disconnect with initialization)
 - rust-lang#110103 (Report overflows gracefully with new solver)
 - rust-lang#110122 (Fix x check --stage 1 when download-ci-llvm=false)
 - rust-lang#110133 (Do not use ImplDerivedObligationCause for inherent impl method error reporting)
 - rust-lang#110135 (Revert "Don't recover lifetimes/labels containing emojis as character literals")
 - rust-lang#110235 (Fix `--extend-css` option)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit c47937d into rust-lang:master Apr 13, 2023
@rustbot rustbot added this to the 1.70.0 milestone Apr 13, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@onur-ozkan onur-ozkan onur-ozkan approved these changes

Assignees

@onur-ozkan onur-ozkan

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
Milestone
1.70.0
Development

Successfully merging this pull request may close these issues.
4 participants
@jyn514 @rustbot @bors @onur-ozkan