diff options
| author | kennytm <kennytm@gmail.com> | 2017-10-19 23:13:34 +0800 |
|---|---|---|
| committer | kennytm <kennytm@gmail.com> | 2017-10-20 00:01:57 +0800 |
| commit | 437186217ba37d52da9f657e78b56874a010cd98 (patch) | |
| tree | 7c21efcf471639d4bd5bcff341deca02313c59ce | |
| parent | dd41422b66242bb53af9e8dc090718b7602243bb (diff) | |
| parent | 27cc11931aee7674e4c295ada7d69e0af45f6989 (diff) | |
| download | rust-437186217ba37d52da9f657e78b56874a010cd98.tar.gz rust-437186217ba37d52da9f657e78b56874a010cd98.zip | |
Rollup merge of #45382 - Keruspe:master, r=Mark-Simulacrum
rustbuild: fix dist in debug mode In debug mode, the artifacts are placed in "debug", so don't hardcode "release" and use our helper to get the right directory name
| -rw-r--r-- | src/bootstrap/dist.rs | 2 |
1 files changed, 1 insertions, 1 deletions
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 @@ impl Step for Analysis { 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"); |