Skip to content

rustbuild: Hotfix to unbreak nightly #38639

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

Merged
bors merged 3 commits into from
Dec 28, 2016
Merged

rustbuild: Hotfix to unbreak nightly #38639

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9d3616f
rustbuild: get an empty slice the straight-forward way
xen0n Dec 27, 2016
3991046
rustbuild: clarify comment on target array calculation
xen0n Dec 27, 2016
cf89453
rustbuild: fix host-only rules ignoring targets in dist steps
xen0n Dec 27, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 13 additions & 6 deletions src/bootstrap/step.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -838,14 +838,21 @@ invalid rule dependency graph detected, was a rule added and maybe typo'd?
} else {
&self.build.config.target
};
// If --target was specified but --host wasn't specified, don't run
// any host-only tests
// Determine the actual targets participating in this rule.
// NOTE: We should keep the full projection from build triple to
// the hosts for the dist steps, now that the hosts array above is
// truncated to avoid duplication of work in that case. Therefore
// the original non-shadowed hosts array is used below.
let arr = if rule.host {
if self.build.flags.target.len() > 0 &&
self.build.flags.host.len() == 0 {
&hosts[..0]
// If --target was specified but --host wasn't specified,
// don't run any host-only tests. Also, respect any `--host`
// overrides as done for `hosts`.
if self.build.flags.host.len() > 0 {
&self.build.flags.host[..]
} else if self.build.flags.target.len() > 0 {
&[]
} else {
hosts
&self.build.config.host[..]
}
} else {
targets
Expand Down