diff options
| author | bors <bors@rust-lang.org> | 2017-09-03 00:51:47 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2017-09-03 00:51:47 +0000 |
| commit | 5e9431a6f5178d2d5086a89782d450568614da8d (patch) | |
| tree | c131124b80576405228a57f7e60f7e2ca11b2f28 /src/bootstrap | |
| parent | 6f667301e22a665b0bf5587ef508da7e01c496c8 (diff) | |
| parent | 5eb478a9e671bb6b2c868d426fadcc80a9d6f2c3 (diff) | |
| download | rust-5e9431a6f5178d2d5086a89782d450568614da8d.tar.gz rust-5e9431a6f5178d2d5086a89782d450568614da8d.zip | |
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
Diffstat (limited to 'src/bootstrap')
| -rw-r--r-- | src/bootstrap/tool.rs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/bootstrap/tool.rs b/src/bootstrap/tool.rs index 0ad5bb8d2f6..b129aa113a0 100644 --- 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() { |