Skip to content

Commit a816fa1

Browse files
committed
Move handling of RUSTC_PARALLEL_COMPILER to compile.rs
No longer needs to live in `rustc.rs`
1 parent 3d13f46 commit a816fa1

File tree

2 files changed

+1
-5
lines changed

2 files changed

+1
-5
lines changed

src/bootstrap/bin/rustc.rs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -170,10 +170,6 @@ fn main() {
170170
cmd.arg("-Z").arg("force-unstable-if-unmarked");
171171
}
172172

173-
if env::var_os("RUSTC_PARALLEL_COMPILER").is_some() {
174-
cmd.arg("--cfg").arg("parallel_compiler");
175-
}
176-
177173
if verbose > 1 {
178174
eprintln!(
179175
"rustc command: {:?}={:?} {:?}",

src/bootstrap/compile.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -480,7 +480,7 @@ pub fn rustc_cargo_env(builder: &Builder<'_>, cargo: &mut Cargo) {
480480
cargo.env("CFG_DEFAULT_LINKER", s);
481481
}
482482
if builder.config.rustc_parallel {
483-
cargo.env("RUSTC_PARALLEL_COMPILER", "1");
483+
cargo.rustflag("--cfg=parallel_compiler");
484484
}
485485
if builder.config.rust_verify_llvm_ir {
486486
cargo.env("RUSTC_VERIFY_LLVM_IR", "1");

0 commit comments

Comments
 (0)