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 llvm-tblgen for cross compiling #102790

Merged
merged 4 commits into from
Oct 9, 2022
Merged

Fix llvm-tblgen for cross compiling #102790

merged 4 commits into from
Oct 9, 2022

Conversation

cuviper
Copy link
Member

@cuviper cuviper commented Oct 7, 2022

  • Let llvm-config tell us where to find its tools
  • Add llvm-tblgen to rust-dev for cross-compiling

Fixes #86890.
r? @jyn514

@rustbot rustbot added the T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) label Oct 7, 2022
@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Oct 7, 2022
@cuviper
Copy link
Member Author

cuviper commented Oct 7, 2022

Per the mentoring instructions in #86890 (comment):

@bors try

@bors
Copy link
Contributor

bors commented Oct 7, 2022

⌛ Trying commit c327719 with merge 2fc484f3baebdc3671bdbc7d23da4839162228d9...

@cuviper
Copy link
Member Author

cuviper commented Oct 7, 2022

Hmm, bootstrap's unit tests don't like trying to execute its mock llvm-config...

@jyn514
Copy link
Member

jyn514 commented Oct 7, 2022

@cuviper I think you may need to change this to support --dry-run - does using dry run locally reproduce the test failure?

@rust-log-analyzer

This comment has been minimized.

Sign in to view
@bors
Copy link
Contributor

bors commented Oct 7, 2022

☀️ Try build successful - checks-actions
Build commit: 2fc484f3baebdc3671bdbc7d23da4839162228d9 (2fc484f3baebdc3671bdbc7d23da4839162228d9)

@cuviper
Copy link
Member Author

cuviper commented Oct 7, 2022 •
edited
Loading

I checked out that try-commit and confirmed that ./x build --host i686-unknown-linux-gnu does find ci-llvm/bin/llvm-tblgen.

I also guarded this to not run llvm-config in dry runs. I didn't bother to set approximate paths, but I could if you want.

@jyn514
Copy link
Member

jyn514 commented Oct 8, 2022

Thanks! No need to set dummy paths; the only thing it would be useful for is #102563 and we're planning to take a different approach there.

@bors r+

@bors
Copy link
Contributor

bors commented Oct 8, 2022

📌 Commit a027474 has been approved by jyn514

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 Oct 8, 2022
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Oct 8, 2022
@matthiaskrgr
Rollup merge of rust-lang#102790 - cuviper:llvm-tblgen, r=jyn514
87e219a 
Fix llvm-tblgen for cross compiling

- Let llvm-config tell us where to find its tools
- Add llvm-tblgen to rust-dev for cross-compiling

Fixes rust-lang#86890.
r? `@jyn514`
@matthiaskrgr matthiaskrgr mentioned this pull request Oct 8, 2022
Closed
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Oct 8, 2022
@matthiaskrgr
Rollup merge of rust-lang#102790 - cuviper:llvm-tblgen, r=jyn514
439a053 
Fix llvm-tblgen for cross compiling

- Let llvm-config tell us where to find its tools
- Add llvm-tblgen to rust-dev for cross-compiling

Fixes rust-lang#86890.
r? ``@jyn514``
@matthiaskrgr matthiaskrgr mentioned this pull request Oct 8, 2022
Closed
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Oct 8, 2022
@matthiaskrgr
Rollup merge of rust-lang#102790 - cuviper:llvm-tblgen, r=jyn514
854af44 
Fix llvm-tblgen for cross compiling

- Let llvm-config tell us where to find its tools
- Add llvm-tblgen to rust-dev for cross-compiling

Fixes rust-lang#86890.
r? ```@jyn514```
@matthiaskrgr matthiaskrgr mentioned this pull request Oct 8, 2022
Closed
@notriddle notriddle mentioned this pull request Oct 9, 2022
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Oct 9, 2022
@bors
Auto merge of rust-lang#102822 - notriddle:rollup-mgfjb62, r=notriddle
c078410 
Rollup of 8 pull requests

Successful merges:

 - rust-lang#99818 (don't ICE when normalizing closure input tys)
 - rust-lang#102514 (Don't repeat lifetime names from outer binder in print)
 - rust-lang#102661 (rustdoc: Document effect of fundamental types)
 - rust-lang#102782 (Add regression test for rust-lang#102124)
 - rust-lang#102790 (Fix llvm-tblgen for cross compiling)
 - rust-lang#102807 (Document `rust-docs-json` component)
 - rust-lang#102812 (Remove empty core::lazy and std::lazy)
 - rust-lang#102818 (Clean up rustdoc highlight.rs imports a bit)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 21c6a0e into rust-lang:master Oct 9, 2022
@rustbot rustbot added this to the 1.66.0 milestone Oct 9, 2022
@cuviper cuviper deleted the llvm-tblgen branch October 15, 2022 00:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@jyn514 jyn514

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.66.0
Development

Successfully merging this pull request may close these issues.

download-ci-llvm does not include llvm-tblgen
6 participants
@cuviper @bors @jyn514 @rust-log-analyzer @rust-highfive @rustbot