squiid/rust
1
0
Fork 0
Code Issues Pull requests Projects Activity

Auto merge of #84095 - infinity0:master, r=Mark-Simulacrum

Browse source 
bootstrap: check local_rebuild before adding --cfg=bootstrap, closes #84057
This commit is contained in:
bors 2021-04-12 08:03:59 +00:00
commit 67e402f946
1 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/bootstrap/compile.rs
View file

@ -462,11 +462,13 @@ impl Step for StartupObjects {
let dst_file = &dst_dir.join(file.to_string() + ".o"); let dst_file = &dst_dir.join(file.to_string() + ".o");
if !up_to_date(src_file, dst_file) { if !up_to_date(src_file, dst_file) {
let mut cmd = Command::new(&builder.initial_rustc); 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( builder.run(
cmd.env("RUSTC_BOOTSTRAP", "1") cmd.arg("--target")
.arg("--cfg")
.arg("bootstrap")
.arg("--target")
.arg(target.rustc_target_arg()) .arg(target.rustc_target_arg())
.arg("--emit=obj") .arg("--emit=obj")
.arg("-o") .arg("-o")