Skip to content

Commit 49b6773

Browse files
committed
Correct the timestamp for CodegenBackend check
1 parent b53468f commit 49b6773

File tree

2 files changed

+13
-4
lines changed

2 files changed

+13
-4
lines changed

src/bootstrap/check.rs

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -186,13 +186,10 @@ impl Step for CodegenBackend {
186186
_ => panic!("unknown backend: {}", self.backend),
187187
}
188188

189-
let tmp_stamp = build.cargo_out(compiler, Mode::Librustc, target)
190-
.join(".tmp.stamp");
191-
192189
let _folder = build.fold_output(|| format!("stage{}-rustc_trans", compiler.stage));
193190
run_cargo(build,
194191
cargo.arg("--features").arg(features),
195-
&tmp_stamp,
192+
&codegen_backend_stamp(build, compiler, target, self.backend),
196193
true);
197194
}
198195
}
@@ -254,3 +251,13 @@ pub fn libtest_stamp(builder: &Builder, compiler: Compiler, target: Interned<Str
254251
pub fn librustc_stamp(builder: &Builder, compiler: Compiler, target: Interned<String>) -> PathBuf {
255252
builder.cargo_out(compiler, Mode::Librustc, target).join(".librustc-check.stamp")
256253
}
254+
255+
/// Cargo's output path for librustc_trans in a given stage, compiled by a particular
256+
/// compiler for the specified target and backend.
257+
fn codegen_backend_stamp(build: &Build,
258+
compiler: Compiler,
259+
target: Interned<String>,
260+
backend: Interned<String>) -> PathBuf {
261+
build.cargo_out(compiler, Mode::Librustc, target)
262+
.join(format!(".librustc_trans-{}-check.stamp", backend))
263+
}

src/bootstrap/compile.rs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -795,6 +795,8 @@ pub fn librustc_stamp(builder: &Builder, compiler: Compiler, target: Interned<St
795795
builder.cargo_out(compiler, Mode::Librustc, target).join(".librustc.stamp")
796796
}
797797

798+
/// Cargo's output path for librustc_trans in a given stage, compiled by a particular
799+
/// compiler for the specified target and backend.
798800
fn codegen_backend_stamp(builder: &Builder,
799801
compiler: Compiler,
800802
target: Interned<String>,

0 commit comments

Comments
 (0)