Skip to content

Commit 3a31213

Browse files
committed
Auto merge of rust-lang#56703 - alexcrichton:fix-tools, r=Mark-Simulacrum
Fix build of the `build-manifest` tool Accidentally broken in rust-lang#56258!
2 parents 4c0116e + ddd8b41 commit 3a31213

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

src/ci/docker/mingw-check/Dockerfile

+2-1
Original file line numberDiff line numberDiff line change
@@ -20,4 +20,5 @@ COPY scripts/sccache.sh /scripts/
2020
RUN sh /scripts/sccache.sh
2121

2222
ENV RUN_CHECK_WITH_PARALLEL_QUERIES 1
23-
ENV SCRIPT python2.7 ../x.py check --target=i686-pc-windows-gnu --host=i686-pc-windows-gnu
23+
ENV SCRIPT python2.7 ../x.py check --target=i686-pc-windows-gnu --host=i686-pc-windows-gnu && \
24+
python2.7 ../x.py build --stage 0 src/tools/build-manifest

src/tools/build-manifest/src/main.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ extern crate serde_derive;
1414

1515
use std::collections::BTreeMap;
1616
use std::env;
17-
use std::fs::File;
17+
use std::fs;
1818
use std::io::{self, Read, Write};
1919
use std::path::{PathBuf, Path};
2020
use std::process::{Command, Stdio};

0 commit comments

Comments
 (0)