about summary refs log tree commit diff
path: root/src/bootstrap
diff options
context:
space:
mode:
authorJosh Stone <jistone@redhat.com>2019-09-27 12:31:00 -0700
committerJosh Stone <jistone@redhat.com>2019-10-07 13:48:16 -0700
commitdc8ee51c5418ce37b63f1c9bdee98745f5dfe627 (patch)
tree6c7c8209665c9718f05156a94ee7f0ad694b3914 /src/bootstrap
parentfaee5fd388a564febc56aa642241f221c0ac1cd1 (diff)
downloadrust-dc8ee51c5418ce37b63f1c9bdee98745f5dfe627.tar.gz
rust-dc8ee51c5418ce37b63f1c9bdee98745f5dfe627.zip
Use builder.compiler_for() to find the libstd stamp
Diffstat (limited to 'src/bootstrap')
-rw-r--r--src/bootstrap/dist.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/bootstrap/dist.rs b/src/bootstrap/dist.rs
index ceb7acb83e7..e1e47d5370a 100644
--- a/src/bootstrap/dist.rs
+++ b/src/bootstrap/dist.rs
@@ -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()));