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

bootstrap: include llvm-dwp in CI LLVM #80087

Merged
merged 1 commit into from
Dec 16, 2020

Conversation

davidtwco
Copy link
Member

Fixes #80086.

This PR includes the llvm-dwp tool in the CI LLVM (which rustc developers can download instead of building LLVM locally) - llvm-dwp is required by Split DWARF which landed in PR #77117.

r? @Mark-Simulacrum

This commit includes the `llvm-dwp` tool in the CI LLVM (which rustc
developers can download instead of building LLVM locally) - `llvm-dwp`
is required by Split DWARF which landed in PR rust-lang#77117.

Signed-off-by: David Wood <david@davidtw.co>
@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Dec 16, 2020
@jyn514 jyn514 added T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) T-infra Relevant to the infrastructure team, which will review and decide on the PR/issue. labels Dec 16, 2020
@Mark-Simulacrum
Copy link
Member

@bors r+ p=1

@bors
Copy link
Contributor

bors commented Dec 16, 2020

📌 Commit 6132e21 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-review Status: Awaiting review from the assignee but also interested parties. labels Dec 16, 2020
@bors
Copy link
Contributor

bors commented Dec 16, 2020

⌛ Testing commit 6132e21 with merge b32e6e6...

@bors
Copy link
Contributor

bors commented Dec 16, 2020

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

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Dec 16, 2020
@bors bors merged commit b32e6e6 into rust-lang:master Dec 16, 2020
@rustbot rustbot added this to the 1.50.0 milestone Dec 16, 2020
@davidtwco davidtwco deleted the issue-80086-llvm-dwp-in-ci-llvm branch December 16, 2020 22:25
davidtwco added a commit to davidtwco/rust that referenced this pull request Dec 17, 2020
Unfortunately, rust-lang#80087 forgot to update the ci-llvm stamp, so the updated
ci-llvm tarball with `llvm-dwp` wasn't downloaded by users. This commit
updates the ci-llvm stamp to resolve that problem.

Signed-off-by: David Wood <david@davidtw.co>
bors added a commit to rust-lang-ci/rust that referenced this pull request Dec 17, 2020
…r=Mark-Simulacrum

bootstrap: update ci-llvm stamp after rust-lang#80087

Fixes rust-lang#80086.

Unfortunately, rust-lang#80087 forgot to update the ci-llvm stamp, so the updated ci-llvm tarball with `llvm-dwp` wasn't downloaded by users. This PR updates the ci-llvm stamp to resolve that problem.

r? `@Mark-Simulacrum`
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
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) T-infra Relevant to the infrastructure team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

x.py build fails with download-ci-llvm = true
6 participants