From: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
Date: Wed, 18 Oct 2017 19:55:12 +0000 (+0200)
Subject: rustbuild: fix dist in debug mode
X-Git-Url: https://git.lizzy.rs/?a=commitdiff_plain;h=27cc11931aee7674e4c295ada7d69e0af45f6989;p=rust.git

rustbuild: fix dist in debug mode

Signed-off-by: Marc-Antoine Perennou <Marc-Antoine@Perennou.com>
---

diff --git a/src/bootstrap/dist.rs b/src/bootstrap/dist.rs
index 02dfa04d920..38dca108012 100644
--- a/src/bootstrap/dist.rs
+++ b/src/bootstrap/dist.rs
@@ -630,7 +630,7 @@ fn run(self, builder: &Builder) -> PathBuf {
         let image = tmpdir(build).join(format!("{}-{}-image", name, target));
 
         let src = build.stage_out(compiler, Mode::Libstd)
-            .join(target).join("release").join("deps");
+            .join(target).join(build.cargo_dir()).join("deps");
 
         let image_src = src.join("save-analysis");
         let dst = image.join("lib/rustlib").join(target).join("analysis");