about summary refs log tree commit diff
diff options
context:
space:
mode:
authorMazdak Farrokhzad <twingoow@gmail.com>2019-04-27 14:12:41 +0200
committerGitHub <noreply@github.com>2019-04-27 14:12:41 +0200
commit7475db5cfa39438c7e0ef8e0d05d6c286f1ae48d (patch)
treed981c0846742d775a466af75eb9b94bf8b49bd1a
parent7f685740ec14a2c59bf3083757e5865194663f97 (diff)
parentc1a45889ce5dfa0dfd20b59a1c85b3b4816eaba7 (diff)
downloadrust-7475db5cfa39438c7e0ef8e0d05d6c286f1ae48d.tar.gz
rust-7475db5cfa39438c7e0ef8e0d05d6c286f1ae48d.zip
Rollup merge of #60315 - pietroalbini:fix-tools-version, r=Mark-Simulacrum
bootstrap: use correct version numbers for llvm-tools and lldb

The current URLs for the `llvm-tools` and `lldb` components are a bit broken right now:

```
https://static.rust-lang.org/dist/2019-04-25/llvm-tools-1.34.1 (fc50f328b 2019-04-24)-aarch64-unknown-linux-gnu.tar.gz
```

This PR uses proper version numbers for those. Tested a dist build locally and everything works.

r? @Mark-Simulacrum
-rw-r--r--src/bootstrap/lib.rs4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/bootstrap/lib.rs b/src/bootstrap/lib.rs
index fb60b470a36..f63aac0f0e2 100644
--- a/src/bootstrap/lib.rs
+++ b/src/bootstrap/lib.rs
@@ -1049,7 +1049,7 @@ impl Build {
     }
 
     fn llvm_tools_package_vers(&self) -> String {
-        self.package_vers(&self.rust_version())
+        self.package_vers(channel::CFG_RELEASE_NUM)
     }
 
     fn llvm_tools_vers(&self) -> String {
@@ -1057,7 +1057,7 @@ impl Build {
     }
 
     fn lldb_package_vers(&self) -> String {
-        self.package_vers(&self.rust_version())
+        self.package_vers(channel::CFG_RELEASE_NUM)
     }
 
     fn lldb_vers(&self) -> String {