Skip to content

Commit

Permalink
Rollup merge of rust-lang#60315 - pietroalbini:fix-tools-version, r=M…
Browse files Browse the repository at this point in the history
…ark-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 (fc50f32 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
  • Loading branch information
Centril committed Apr 27, 2019
2 parents 16389db + c1a4588 commit 8d7086b
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/bootstrap/lib.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1049,15 +1049,15 @@ 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 {
self.rust_version()
}

fn lldb_package_vers(&self) -> String {
self.package_vers(&self.rust_version())
self.package_vers(channel::CFG_RELEASE_NUM)
}

fn lldb_vers(&self) -> String {
Expand Down

0 comments on commit 8d7086b

Please sign in to comment.