Mirrors/rust
1
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2026-05-29 20:46:07 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #911 from cuviper/rustup

Browse Source 
Support either rustup or multirust environment variables
This commit is contained in:
llogiq
2016-05-10 23:23:44 +02:00
parent 855b292cda 11987f5b6f
commit da122a394b
1 changed files with 7 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib.rs
+7 -2
View File
@@ -104,9 +104,14 @@ pub fn main() {
}
let dep_path = env::current_dir().expect("current dir is not readable").join("target").join("debug").join("deps");
let sys_root = match (option_env!("MULTIRUST_HOME"), option_env!("MULTIRUST_TOOLCHAIN")) {
let home = option_env!("RUSTUP_HOME").or(option_env!("MULTIRUST_HOME"));
let toolchain = option_env!("RUSTUP_TOOLCHAIN").or(option_env!("MULTIRUST_TOOLCHAIN"));
let sys_root = match (home, toolchain) {
(Some(home), Some(toolchain)) => format!("{}/toolchains/{}", home, toolchain),
_ => option_env!("SYSROOT").expect("need to specify SYSROOT env var during clippy compilation or use multirust").to_owned(),
_ => option_env!("SYSROOT")
.expect("need to specify SYSROOT env var during clippy compilation, or use rustup or multirust")
.to_owned(),
};
if let Some("clippy") = std::env::args().nth(1).as_ref().map(AsRef::as_ref) {