user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix rustbuild --color conflict when building on Travis outside of Docker.

Browse source
This commit is contained in:
kennytm 2017-10-15 19:45:14 +08:00
parent b633341c49
commit ebbcad9ae0
No known key found for this signature in database
GPG key ID: FEF6C8051D0E013C
1 changed files with 2 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/bootstrap/compile.rs
View file

@ -29,7 +29,7 @@ use build_helper::{output, mtime, up_to_date};
use filetime::FileTime;
use serde_json;
use util::{exe, libdir, is_dylib, copy, read_stamp_file};
use util::{exe, libdir, is_dylib, copy, read_stamp_file, CiEnv};
use {Build, Compiler, Mode};
use native;
use tool;
@ -792,7 +792,7 @@ fn run_cargo(build: &Build, cargo: &mut Command, stamp: &Path) {
cargo.arg("--message-format").arg("json")
.stdout(Stdio::piped());
if stderr_isatty() {
if stderr_isatty() && build.ci_env == CiEnv::None {
// since we pass message-format=json to cargo, we need to tell the rustc
// wrapper to give us colored output if necessary. This is because we
// only want Cargo's JSON output, not rustcs.