Use builder.compiler_for() to find the libstd stamp

This commit is contained in:
Josh Stone 2019-09-27 12:31:00 -07:00
parent faee5fd388
commit dc8ee51c54

View file

@ -680,11 +680,11 @@ impl Step for Std {
let image = tmpdir(builder).join(format!("{}-{}-image", name, target));
let _ = fs::remove_dir_all(&image);
let dst = image.join("lib/rustlib").join(target).join("lib");
t!(fs::create_dir_all(&dst));
let stamp = dbg!(compile::libstd_stamp(builder, compiler, target));
let compiler_to_use = builder.compiler_for(compiler.stage, compiler.host, target);
let stamp = dbg!(compile::libstd_stamp(builder, compiler_to_use, target));
for (path, host) in builder.read_stamp_file(&stamp) {
if !host {
builder.copy(&path, &dst.join(path.file_name().unwrap()));