about summary refs log tree commit diff
path: root/src/bootstrap/lib.rs
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2017-04-29 03:56:09 +0000
committerbors <bors@rust-lang.org>2017-04-29 03:56:09 +0000
commit95467d33cb98c8a9be12da15be559e60628180f5 (patch)
tree7f26940956ae3d491e87b1333bfd7ce60347cd77 /src/bootstrap/lib.rs
parent810ed98d08158574e98b504c0955fce6c6a72ad9 (diff)
parenta8c6ba9c6eff834721e0c775de975b8741431fd0 (diff)
downloadrust-95467d33cb98c8a9be12da15be559e60628180f5.tar.gz
rust-95467d33cb98c8a9be12da15be559e60628180f5.zip
Auto merge of #41577 - Keruspe:master, r=alexcrichton
rustbuild improvements

Properly hook up cargo and rls in the build phase, and install them, when extended build is enabled.
Diffstat (limited to 'src/bootstrap/lib.rs')
-rw-r--r--src/bootstrap/lib.rs5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/bootstrap/lib.rs b/src/bootstrap/lib.rs
index 74c58844741..2852421ad28 100644
--- a/src/bootstrap/lib.rs
+++ b/src/bootstrap/lib.rs
@@ -1054,6 +1054,11 @@ impl Build {
         self.package_vers(&self.release_num("cargo"))
     }
 
+    /// Returns the value of `package_vers` above for rls
+    fn rls_package_vers(&self) -> String {
+        self.package_vers(&self.release_num("rls"))
+    }
+
     /// Returns the `version` string associated with this compiler for Rust
     /// itself.
     ///