Skip to content

Commit 046da7a

Browse files
authored
Rollup merge of rust-lang#80901 - jyn514:better-colors, r=Mark-Simulacrum
Make `x.py --color always` apply to logging too Follow-up to rust-lang#78548, rust-lang#79004. r? `@Mark-Simulacrum`
2 parents 0d901f2 + 04b6036 commit 046da7a

File tree

1 file changed

+10
-0
lines changed

1 file changed

+10
-0
lines changed

src/bootstrap/builder.rs

+10
Original file line numberDiff line numberDiff line change
@@ -814,12 +814,22 @@ impl<'a> Builder<'a> {
814814
cargo.env("REAL_LIBRARY_PATH", e);
815815
}
816816

817+
// Found with `rg "init_env_logger\("`. If anyone uses `init_env_logger`
818+
// from out of tree it shouldn't matter, since x.py is only used for
819+
// building in-tree.
820+
let color_logs = ["RUSTDOC_LOG_COLOR", "RUSTC_LOG_COLOR", "RUST_LOG_COLOR"];
817821
match self.build.config.color {
818822
Color::Always => {
819823
cargo.arg("--color=always");
824+
for log in &color_logs {
825+
cargo.env(log, "always");
826+
}
820827
}
821828
Color::Never => {
822829
cargo.arg("--color=never");
830+
for log in &color_logs {
831+
cargo.env(log, "never");
832+
}
823833
}
824834
Color::Auto => {} // nothing to do
825835
}

0 commit comments

Comments
 (0)