From 11987f5b6f9c478cdd15543625a27fb5df1996f4 Mon Sep 17 00:00:00 2001 From: Josh Stone Date: Tue, 10 May 2016 13:45:37 -0700 Subject: [PATCH] Support either rustup or multirust environment variables Fixes #910 --- src/lib.rs | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/src/lib.rs b/src/lib.rs index 5dd473c8d09..2d05419673d 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -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) {