Skip to content

Commit

Permalink
Auto merge of #38394 - alexcrichton:fix-nightlies, r=brson
Browse files Browse the repository at this point in the history
rustbuild: Package rust-mingw by default

This fixes the `make dist` step on MinGW to package the `rust-mingw` component
by default. This should hopefully be the last step in fixing nightlies.
  • Loading branch information
bors committed Dec 15, 2016
2 parents f70ad0a + 67ae4ab commit 8f02c42
Showing 1 changed file with 6 additions and 1 deletion.
7 changes: 6 additions & 1 deletion src/bootstrap/step.rs
Original file line number Diff line number Diff line change
Expand Up @@ -490,7 +490,12 @@ pub fn build_rules(build: &Build) -> Rules {
.default(true)
.run(move |s| dist::std(build, &s.compiler(), s.target));
rules.dist("dist-mingw", "path/to/nowhere")
.run(move |s| dist::mingw(build, s.target));
.default(true)
.run(move |s| {
if s.target.contains("pc-windows-gnu") {
dist::mingw(build, s.target)
}
});
rules.dist("dist-src", "src")
.default(true)
.host(true)
Expand Down

0 comments on commit 8f02c42

Please sign in to comment.