Auto merge of #44176 - nrc:update-rls, r=alexcrichton

Update rls And expose the `CFG_VERSION` env var to tools so they can determine the version of Rust. This gets the RLS back on master and so completes the PR dance for the generators PR. r? @alexcrichton
rust-lang · Sep 3, 2017 · 5e9431a · 5e9431a
2 parents 6f66730 + 5eb478a
commit 5e9431a
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 8 deletions.
diff --git a/src/Cargo.lock b/src/Cargo.lock
diff --git a/src/bootstrap/tool.rs b/src/bootstrap/tool.rs
@@ -120,6 +120,7 @@ fn prepare_tool_cargo(
     }
 
     cargo.env("CFG_RELEASE_CHANNEL", &build.config.channel);
+    cargo.env("CFG_VERSION", build.rust_version());
 
     let info = GitInfo::new(&build.config, &dir);
     if let Some(sha) = info.sha() {

diff --git a/src/tools/rls b/src/tools/rls