nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2025-02-12 06:53:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Auto merge of #56703 - alexcrichton:fix-tools, r=Mark-Simulacrum

Browse Source 
Fix build of the `build-manifest` tool

Accidentally broken in #56258!
This commit is contained in:
bors 2018-12-11 08:14:14 +00:00
commit 3a31213371
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/ci/docker/mingw-check/Dockerfile
View File

@ -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

2
src/tools/build-manifest/src/main.rs
View File

@ -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};