build: add llvm-tools to manifest #51728
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This commit expands on a previous commit to build llvm-tools as a rustup component. It causes the llvm-tools component to be built if the extended step is active. It also adds llvm-tools to the build manifest so rustup can find it.
This comment has been minimized.
This comment has been minimized.
pietroalbini
added
the
S-waiting-on-review
|
r? @kennytm |
src/bootstrap/dist.rs
Outdated
| let llvm_tools_installer = builder.ensure(LlvmTools { | ||
| stage, | ||
| target, | ||
| compiler: builder.compiler(stage, target) |
There was a problem hiding this comment.
This should be removed -- the LlvmTools step does not need a compiler, it should be using the target argument instead of compiler.host.
|
@bors try Checks if the tools are properly distributed. |
|
⌛ Trying commit 5fc87eb with merge 21fcddddc57d6a334038466d4a21bfa6ce40b41f... |
Use `target` instead.
|
Ok I think I straightened out the issue with |
|
Pending try results I think this is good. |
kennytm
approved these changes
Jun 24, 2018
There was a problem hiding this comment.
LLVM tools is successfully uploaded to https://s3-us-west-1.amazonaws.com/rust-lang-ci2/rustc-builds/21fcddddc57d6a334038466d4a21bfa6ce40b41f/llvm-tools-nightly-x86_64-unknown-linux-gnu.tar.xz
|
@bors r+ |
|
📌 Commit f10da5f has been approved by |
bors
added
S-waiting-on-bors
|
⌛ Testing commit f10da5f with merge 0b3686f7d2e5f3e96004634185df0ac4e85a8ded... |
|
💔 Test failed - status-travis |
bors
added
S-waiting-on-review
|
The job Click to expand the log.I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact |
1 similar comment
|
The job Click to expand the log.I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact |
bors
added
S-waiting-on-bors
|
⌛ Testing commit f10da5f with merge 465eabb433e6644c66c9f1525f89fee4a013fb21... |
bors
added
S-waiting-on-bors
|
⌛ Testing commit f10da5f with merge 2f50d35642a089106be718da7322346eba625ed1... |
|
💔 Test failed - status-travis |
|
The job Click to expand the log.I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact |
bors
added
S-waiting-on-review
|
The job Click to expand the log.I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact |
|
bors
added
S-waiting-on-bors
|
⌛ Testing commit f10da5f with merge 48c67bdb1d94bca198178c716c5451d50a2561b1... |
|
💔 Test failed - status-travis |
bors
added
S-waiting-on-review
|
The job Click to expand the log.I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact |
1 similar comment
|
The job Click to expand the log.I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact |
bors
added
S-waiting-on-bors
5 tasks
bors
added a commit
that referenced
this pull request
Jun 25, 2018
build: add llvm-tools to manifest
This commit expands on a previous commit to build llvm-tools as a rustup component. It causes the llvm-tools component to be built if the extended step is active. It also adds llvm-tools to the build manifest so rustup can find it.
I tested this as far as I could, but had to hack `build-manifest/src/main.rs` a bit as it is not supported on MacOS. The main change I am not sure about is this line:
```rust
self.package("llvm-tools", &mut manifest.pkg, TARGETS);
```
There are numerous calls to `self.package()`, and I'm not sure if `TARGETS`, `HOSTS`, or `["*"]` is appropriate for llvm-tools.
Otherwise I mostly copied the example set by `rustfmt-preview`.
|
☀️ Test successful - status-appveyor, status-travis |
|
I have problem with LlvmTools step when LLVM is external. does the compoment should be built at all on such configuration ? |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This commit expands on a previous commit to build llvm-tools as a rustup component. It causes the llvm-tools component to be built if the extended step is active. It also adds llvm-tools to the build manifest so rustup can find it.
I tested this as far as I could, but had to hack
build-manifest/src/main.rsa bit as it is not supported on MacOS. The main change I am not sure about is this line:There are numerous calls to
self.package(), and I'm not sure ifTARGETS,HOSTS, or["*"]is appropriate for llvm-tools.Otherwise I mostly copied the example set by
rustfmt-preview.