Skip to content

rustbuild: Tweak default rule inclusion #37775

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

Merged
merged 1 commit into from
Nov 15, 2016

Conversation

alexcrichton
Copy link
Member

If a rule is flagged with default(true) then the pseudo-rule default:foo
will include that. If a rule is also flagged with .host(true), however, then
the rule shouldn't be included for targets that aren't in the host array. This
adds a filter to ensure we don't pull in host rules for targets by accident.

If a rule is flagged with `default(true)` then the pseudo-rule `default:foo`
will include that. If a rule is also flagged with `.host(true)`, however, then
the rule shouldn't be included for targets that aren't in the host array. This
adds a filter to ensure we don't pull in host rules for targets by accident.
@rust-highfive
Copy link
Contributor

r? @aturon

(rust_highfive has picked a reviewer for you, use r? to override)

@brson
Copy link
Contributor

brson commented Nov 14, 2016

@bors r+

@bors
Copy link
Collaborator

bors commented Nov 14, 2016

📌 Commit 7cd8a49 has been approved by brson

@brson
Copy link
Contributor

brson commented Nov 14, 2016

@bors p=1

@brson brson added the beta-nominated Nominated for backporting to the compiler in the beta channel. label Nov 15, 2016
@brson
Copy link
Contributor

brson commented Nov 15, 2016

This may need to be backported. I'm not sure.

@bors
Copy link
Collaborator

bors commented Nov 15, 2016

⌛ Testing commit 7cd8a49 with merge 0ed9519...

bors added a commit that referenced this pull request Nov 15, 2016
rustbuild: Tweak default rule inclusion

If a rule is flagged with `default(true)` then the pseudo-rule `default:foo`
will include that. If a rule is also flagged with `.host(true)`, however, then
the rule shouldn't be included for targets that aren't in the host array. This
adds a filter to ensure we don't pull in host rules for targets by accident.
@bors bors merged commit 7cd8a49 into rust-lang:master Nov 15, 2016
@alexcrichton alexcrichton deleted the try-fix-dox branch November 15, 2016 06:05
@alexcrichton
Copy link
Member Author

Agreed with beta nomination, the beta failure looks like:

thread 'main' panicked at '

target `arm-unknown-linux-musleabi` is not configured as a host,
                            only as a target

', /buildslave/rust-buildbot/slave/beta-dist-rustc-cross-rustbuild-linux/build/src/bootstrap/lib.rs:745

which this PR fixes. The previous backport of #37721 unfortunately just changed the error :(

@alexcrichton alexcrichton added the beta-accepted Accepted for backporting to the compiler in the beta channel. label Nov 15, 2016
brson added a commit that referenced this pull request Nov 15, 2016
@brson brson removed the beta-nominated Nominated for backporting to the compiler in the beta channel. label Nov 15, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
beta-accepted Accepted for backporting to the compiler in the beta channel.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants