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

Add rust-dev component to support rustc development #76332

Merged
merged 1 commit into from
Sep 8, 2020

Conversation

Mark-Simulacrum
Copy link
Member

@Mark-Simulacrum Mark-Simulacrum commented Sep 4, 2020

This is preparatory work for permitting rustc developers to use CI-built LLVM rather than building it locally. Unlike distro-built LLVM, CI built LLVM is essentially guaranteed to behave perfectly for local development -- it is fully up to date, and carries all necessary patches.

This is a separate PR from #76349 because it needs to land before that one, since we want a master build with the full CI LLVM to be available for easier testing.

@Mark-Simulacrum

This comment has been minimized.

@bors

This comment has been minimized.

@bors

This comment has been minimized.

@Mark-Simulacrum

This comment has been minimized.

@bors

This comment has been minimized.

@bors

This comment has been minimized.

@Mark-Simulacrum

This comment has been minimized.

@bors

This comment has been minimized.

@Mark-Simulacrum

This comment has been minimized.

@bors

This comment has been minimized.

@Mark-Simulacrum Mark-Simulacrum changed the title Publish the llvm-config in llvm-tools Expand llvm-tools-preview to support building rustc against that LLVM Sep 4, 2020
@rust-log-analyzer

This comment has been minimized.

@bors

This comment has been minimized.

@bors bors added the S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. label Sep 4, 2020
@jyn514
Copy link
Member

jyn514 commented Sep 4, 2020

This is a separate PR from XXX

Is this a follow-up PR you haven't yet made?

Giant thank you for working on this though ❤️

@Mark-Simulacrum
Copy link
Member Author

Let's try r? @pietroalbini

@bors try -- should've fixed the CI error in latest push

@bors
Copy link
Contributor

bors commented Sep 4, 2020

⌛ Trying commit f61d7bebb37ecbe0a63d734f8e1e8d2c39c8c01d with merge a4fb0b111d9f14089158e58138a74f4ca75e3314...

@bors
Copy link
Contributor

bors commented Sep 4, 2020

☀️ Try build successful - checks-actions, checks-azure
Build commit: a4fb0b111d9f14089158e58138a74f4ca75e3314 (a4fb0b111d9f14089158e58138a74f4ca75e3314)

@jyn514 jyn514 added the T-infra Relevant to the infrastructure team, which will review and decide on the PR/issue. label Sep 5, 2020
@Mark-Simulacrum Mark-Simulacrum added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels Sep 5, 2020
@bors
Copy link
Contributor

bors commented Sep 7, 2020

☀️ Try build successful - checks-actions, checks-azure
Build commit: 3af9be379969902238652b98641dbeb50dbc184d (3af9be379969902238652b98641dbeb50dbc184d)

This currently includes libLLVM, llvm-config, and FileCheck, but will perhaps
expand to more tooling overtime. It should be considered entirely unstable and
may change at any time.
@Mark-Simulacrum
Copy link
Member Author

@pietroalbini Update to rust-dev, should be good to go -- try build exposed a single case where I missed the llvm-tools name but that should be fixed now.

@pietroalbini
Copy link
Member

@bors r+

Thanks!

@bors
Copy link
Contributor

bors commented Sep 8, 2020

📌 Commit aa4554f has been approved by pietroalbini

@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 Sep 8, 2020
@Mark-Simulacrum Mark-Simulacrum changed the title Expand llvm-tools-preview to support building rustc against that LLVM Add rust-dev component to support rustc development Sep 8, 2020
@bors
Copy link
Contributor

bors commented Sep 8, 2020

⌛ Testing commit aa4554f with merge 82c83c40f35894063fdc7d0917426234d6a350ed...

@bors
Copy link
Contributor

bors commented Sep 8, 2020

💔 Test failed - checks-actions

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Sep 8, 2020
@jyn514
Copy link
Member

jyn514 commented Sep 8, 2020

Spurious:

 Building stage1 tool cargo (i686-unknown-linux-gnu)
 Downloading crates ...
warning: spurious network error (2 tries remaining): failed to get 200 response from `https://crates.io/api/v1/crates/socket2/0.3.12/download`, got 503
warning: spurious network error (1 tries remaining): failed to get 200 response from `https://crates.io/api/v1/crates/socket2/0.3.12/download`, got 503
error: failed to download from `https://crates.io/api/v1/crates/socket2/0.3.12/download`

Caused by:
  failed to get 200 response from `https://crates.io/api/v1/crates/socket2/0.3.12/download`, got 503

@bors retry

cc @rust-lang/crates-io , this seems to have been happening a lot lately.

@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 Sep 8, 2020
@bors
Copy link
Contributor

bors commented Sep 8, 2020

⌛ Testing commit aa4554f with merge 5099914...

@bors
Copy link
Contributor

bors commented Sep 8, 2020

☀️ Test successful - checks-actions, checks-azure
Approved by: pietroalbini
Pushing 5099914 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Sep 8, 2020
@bors bors merged commit 5099914 into rust-lang:master Sep 8, 2020
@rustbot rustbot added this to the 1.48.0 milestone Sep 8, 2020
@Mark-Simulacrum Mark-Simulacrum deleted the bootstrap-llvm branch September 8, 2020 19:37
@jyn514 jyn514 added the T-bootstrap Relevant to the bootstrap subteam: Rust's build system (x.py and src/bootstrap) label Sep 12, 2020
Dylan-DPC-zz pushed a commit to Dylan-DPC-zz/rust that referenced this pull request Sep 12, 2020
…hton

Download LLVM from CI to bootstrap (linux-only to start)

This follows rust-lang#76332, adding support for using CI-built LLVM rather than building it locally. This should essentially "just work," but is left off by default in this PR.

While we can support downloading LLVM for multiple host triples, this currently only downloads it for the build triple. That said, it should be possible to expand this relatively easily should multiple host triples be desired. Most people shouldn't be adjusting host/target triples though, so this should cover most use cases.

Currently this downloads LLVM for the last bors-authored commit in the `git log`. This is a bit suboptimal -- we want the last bors-authored commit that touched the llvm-project submodule in basically all cases. But for now this just adds an extra ~20 MB download when rebasing atop latest master. Once we have a submodule bump landing after rust-lang#76332, we can fix this behavior to reduce downloads further.
bors added a commit to rust-lang-ci/rust that referenced this pull request Sep 13, 2020
Download LLVM from CI to bootstrap (linux-only to start)

This follows rust-lang#76332, adding support for using CI-built LLVM rather than building it locally. This should essentially "just work," but is left off by default in this PR.

While we can support downloading LLVM for multiple host triples, this currently only downloads it for the build triple. That said, it should be possible to expand this relatively easily should multiple host triples be desired. Most people shouldn't be adjusting host/target triples though, so this should cover most use cases.

Currently this downloads LLVM for the last bors-authored commit in the `git log`. This is a bit suboptimal -- we want the last bors-authored commit that touched the llvm-project submodule in basically all cases. But for now this just adds an extra ~20 MB download when rebasing atop latest master. Once we have a submodule bump landing after rust-lang#76332, we can fix this behavior to reduce downloads further.
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.

6 participants