about summary refs log tree commit diff
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2016-12-15 19:43:28 +0000
committerbors <bors@rust-lang.org>2016-12-15 19:43:28 +0000
commit8f02c429ad3e2ad687a222d1daae2e04bb9bb876 (patch)
treedd80c6e5f8bfb7bc4bf00945edddf9e7109e76bb
parentf70ad0adfda42d507fdfc90d4d26da4a66ef89f6 (diff)
parent67ae4ab5c22e58c74ad89467cfa16d6d1e4af3ed (diff)
downloadrust-8f02c429ad3e2ad687a222d1daae2e04bb9bb876.tar.gz
rust-8f02c429ad3e2ad687a222d1daae2e04bb9bb876.zip
Auto merge of #38394 - alexcrichton:fix-nightlies, r=brson
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.
-rw-r--r--src/bootstrap/step.rs7
1 files changed, 6 insertions, 1 deletions
diff --git a/src/bootstrap/step.rs b/src/bootstrap/step.rs
index 13c0c644d63..35eb98e4723 100644
--- a/src/bootstrap/step.rs
+++ b/src/bootstrap/step.rs
@@ -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)