diff options
| author | bors <bors@rust-lang.org> | 2018-12-11 08:14:14 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2018-12-11 08:14:14 +0000 |
| commit | 3a3121337122637fa11f0e5d42aec67551e8c125 (patch) | |
| tree | dfd47a9b99247071eadaca98406af2abddc3cb6d | |
| parent | 4c0116e13ffd4b84e6691cd3b1f09269c4e76728 (diff) | |
| parent | ddd8b416a6bfa009db997e4e8724fa0069a850dc (diff) | |
| download | rust-3a3121337122637fa11f0e5d42aec67551e8c125.tar.gz rust-3a3121337122637fa11f0e5d42aec67551e8c125.zip | |
Auto merge of #56703 - alexcrichton:fix-tools, r=Mark-Simulacrum
Fix build of the `build-manifest` tool Accidentally broken in #56258!
| -rw-r--r-- | src/ci/docker/mingw-check/Dockerfile | 3 | ||||
| -rw-r--r-- | src/tools/build-manifest/src/main.rs | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/ci/docker/mingw-check/Dockerfile b/src/ci/docker/mingw-check/Dockerfile index aab339f399c..10aedf6a60e 100644 --- a/src/ci/docker/mingw-check/Dockerfile +++ b/src/ci/docker/mingw-check/Dockerfile @@ -20,4 +20,5 @@ COPY scripts/sccache.sh /scripts/ RUN sh /scripts/sccache.sh ENV RUN_CHECK_WITH_PARALLEL_QUERIES 1 -ENV SCRIPT python2.7 ../x.py check --target=i686-pc-windows-gnu --host=i686-pc-windows-gnu +ENV SCRIPT python2.7 ../x.py check --target=i686-pc-windows-gnu --host=i686-pc-windows-gnu && \ + python2.7 ../x.py build --stage 0 src/tools/build-manifest diff --git a/src/tools/build-manifest/src/main.rs b/src/tools/build-manifest/src/main.rs index d9834f9f0a0..896b380f85c 100644 --- a/src/tools/build-manifest/src/main.rs +++ b/src/tools/build-manifest/src/main.rs @@ -14,7 +14,7 @@ extern crate serde_derive; use std::collections::BTreeMap; use std::env; -use std::fs::File; +use std::fs; use std::io::{self, Read, Write}; use std::path::{PathBuf, Path}; use std::process::{Command, Stdio}; |