diff options
| author | Mark Rousskov <mark.simulacrum@gmail.com> | 2022-07-30 15:44:37 -0400 |
|---|---|---|
| committer | Mark Rousskov <mark.simulacrum@gmail.com> | 2022-07-30 15:58:04 -0400 |
| commit | d63e982cd924ed4d4fbcbb42b9614fc24a91f211 (patch) | |
| tree | 7076fdb52a152d563e420130691dfb2326736b11 /src/bootstrap/native.rs | |
| parent | 1202bbaf48a0a919a2e0cfd8b7dce97e8fc3030d (diff) | |
| download | rust-d63e982cd924ed4d4fbcbb42b9614fc24a91f211.tar.gz rust-d63e982cd924ed4d4fbcbb42b9614fc24a91f211.zip | |
Discover channel for artifact download
When we're downloading based on a CI commit, that can still be -beta- or even -stable-, so we should lookup the channel it was built with.
Diffstat (limited to 'src/bootstrap/native.rs')
| -rw-r--r-- | src/bootstrap/native.rs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/bootstrap/native.rs b/src/bootstrap/native.rs index 01e70b3fb2d..3347246ea8f 100644 --- a/src/bootstrap/native.rs +++ b/src/bootstrap/native.rs @@ -189,7 +189,8 @@ fn download_ci_llvm(builder: &Builder<'_>, llvm_sha: &str) { } else { &builder.config.stage0_metadata.config.artifacts_server }; - let filename = format!("rust-dev-nightly-{}.tar.xz", builder.build.build.triple); + let channel = builder.config.artifact_channel(llvm_sha); + let filename = format!("rust-dev-{}-{}.tar.xz", channel, builder.build.build.triple); let tarball = rustc_cache.join(&filename); if !tarball.exists() { let help_on_error = "error: failed to download llvm from ci |