diff options
| author | kennytm <kennytm@gmail.com> | 2017-10-15 19:45:14 +0800 |
|---|---|---|
| committer | kennytm <kennytm@gmail.com> | 2017-10-21 04:55:33 +0800 |
| commit | ebbcad9ae018e9c6bbd65c573a21783c8fbc0095 (patch) | |
| tree | 6a7bf825efa799761bc28c90bd970419f0655d41 /src/bootstrap | |
| parent | b633341c49498488b6e3fce501e23e9f9f8fadec (diff) | |
| download | rust-ebbcad9ae018e9c6bbd65c573a21783c8fbc0095.tar.gz rust-ebbcad9ae018e9c6bbd65c573a21783c8fbc0095.zip | |
Fix rustbuild --color conflict when building on Travis outside of Docker.
Diffstat (limited to 'src/bootstrap')
| -rw-r--r-- | src/bootstrap/compile.rs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/bootstrap/compile.rs b/src/bootstrap/compile.rs index f837371bebe..a8162f0a92f 100644 --- a/src/bootstrap/compile.rs +++ b/src/bootstrap/compile.rs @@ -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. |
