Fixes other targets rustlibs installation #40479
Conversation
|
Thanks for the pull request, and welcome! The Rust team is excited to review your changes, and you should hear from @alexcrichton (or someone else) soon. If any changes to this PR are deemed necessary, please add them as extra commits. This ensures that the reviewer can see what has changed since they last reviewed the code. Due to the way GitHub handles out-of-date commits, this should also make it reasonably obvious what issues have or haven't been addressed. Large or tricky changes may require several passes of review and changes. Please see the contribution instructions for more information. |
src/bootstrap/install.rs
Outdated
| @@ -49,6 +49,12 @@ pub fn install(build: &Build, stage: u32, host: &str) { | |||
| install_sh(&build, "docs", "rust-docs", stage, host, &prefix, | |||
| &docdir, &libdir, &mandir, &empty_dir); | |||
| } | |||
|
|
|||
| for target in build.config.target.iter().filter(|target| *target != host) { | |||
There was a problem hiding this comment.
Perhaps this filter could be dropped and the rust-std install statement below could get folded into this one?
There was a problem hiding this comment.
I added it because I'm not sure if build.config.target will always have the host target in it, if that is true, then sure, we can safely remove the filter.
There was a problem hiding this comment.
Ah yeah that's always true, config.target is a superset of config.host which always contains config.build
|
☔ The latest upstream changes (presumably #40383) made this pull request unmergeable. Please resolve the merge conflicts. |
|
Thanks! Could you also squash the commits together? |
|
Sorry for the dumb question, but I'm not sure how I can do it correctly, When I try to do a |
|
Also, it seems some checks failed on travis-ci, but there is no log on the ones that fail. |
|
Oh you may wish to execute Also yeah don't worry too much about the CI, the relevant builder passed. |
|
Hey Alex, I just did the squash, the last commit contains all the changes, but for some reason all the other commits still exists behind it, is that the desired result? Maybe that happened because I made the changes directly in my rust fork master instead of a branch. |
|
Hm yeah I've seen oddness before with PRs coming from a master branch, can you perhaps switch it to a different branch? |
When the user select more than one target to generate rustlibs for, rustbuild will only install the host one. This patch fixes it, more info in rust-lang#39235 (comment)
|
@bors: r+ |
|
📌 Commit 56902fb has been approved by |
|
⌛ Testing commit 56902fb with merge 66e2b6c... |
|
💔 Test failed - status-appveyor |
|
… On Wed, Apr 5, 2017 at 2:03 AM, bors ***@***.***> wrote:
💔 Test failed - status-appveyor
<https://ci.appveyor.com/project/rust-lang/rust/build/1.0.2767>
—
You are receiving this because you were mentioned.
Reply to this email directly, view it on GitHub
<#40479 (comment)>, or mute
the thread
<https://github.com/notifications/unsubscribe-auth/AAD95G1lnnBY0i4eY9D0c0WJoH212Ykmks5rs0q5gaJpZM4MbmSO>
.
|
Fixes other targets rustlibs installation When the user select more than one target to generate rustlibs for, rustbuild will only install the host one. This patch fixes it, more info in rust-lang#39235 (comment)
Fixes other targets rustlibs installation When the user select more than one target to generate rustlibs for, rustbuild will only install the host one. This patch fixes it, more info in rust-lang#39235 (comment)
|
⌛ Testing commit 56902fb with merge 09deb66... |
|
@bors retry - prioritizing rollup |
When the user select more than one target to generate rustlibs for, rustbuild will only install the host one.
This patch fixes it, more info in #39235 (comment)