diff options
| author | bors <bors@rust-lang.org> | 2021-04-12 08:03:59 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2021-04-12 08:03:59 +0000 |
| commit | 67e402f94693f0bcf44381db4d92d2da164eb99a (patch) | |
| tree | 7f942725e71a21422ba62e2c69f03a87d2df96b9 /src | |
| parent | d68f7a2f50958d632ef8dc79212481e4f183ed36 (diff) | |
| parent | be5d72129e33d2cadb7fa003395eccd986447833 (diff) | |
| download | rust-67e402f94693f0bcf44381db4d92d2da164eb99a.tar.gz rust-67e402f94693f0bcf44381db4d92d2da164eb99a.zip | |
Auto merge of #84095 - infinity0:master, r=Mark-Simulacrum
bootstrap: check local_rebuild before adding --cfg=bootstrap, closes #84057
Diffstat (limited to 'src')
| -rw-r--r-- | src/bootstrap/compile.rs | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/bootstrap/compile.rs b/src/bootstrap/compile.rs index 8244c7710ab..66a88e85fea 100644 --- a/src/bootstrap/compile.rs +++ b/src/bootstrap/compile.rs @@ -462,11 +462,13 @@ impl Step for StartupObjects { let dst_file = &dst_dir.join(file.to_string() + ".o"); if !up_to_date(src_file, dst_file) { let mut cmd = Command::new(&builder.initial_rustc); + cmd.env("RUSTC_BOOTSTRAP", "1"); + if !builder.local_rebuild { + // a local_rebuild compiler already has stage1 features + cmd.arg("--cfg").arg("bootstrap"); + } builder.run( - cmd.env("RUSTC_BOOTSTRAP", "1") - .arg("--cfg") - .arg("bootstrap") - .arg("--target") + cmd.arg("--target") .arg(target.rustc_target_arg()) .arg("--emit=obj") .arg("-o") |