Merge pull request rust-lang#244 from oli-obk/master

Add sysroot configuration to rls.toml

Author: nrc

README.md

@@ -166,6 +166,9 @@ Currently we accept the following options:
   run) test code.
 * `unstable_features` (`bool`, defaults to `false`) enables unstable features.
   Currently, this includes renaming and formatting.
+* `sysroot` (`String`, defaults to `""`) if the given string is not empty, use
+   the given path as the sysroot for all rustc invocations instead of trying to
+   detect the sysroot automatically
 
 
 ## Contributing

src/build.rs

@@ -368,25 +368,27 @@ impl BuildQueue {
                     if self.config.cfg_test {
                         args.push("--test".to_owned());
                     }
-                    args.push("--sysroot".to_owned());
-                    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 = if let (Some(home), Some(toolchain)) = (home, toolchain) {
-                        format!("{}/toolchains/{}", home, toolchain)
-                    } else {
-                        option_env!("SYSROOT")
-                            .map(|s| s.to_owned())
-                            .or_else(|| Command::new("rustc")
-                                .arg("--print")
-                                .arg("sysroot")
-                                .output()
-                                .ok()
-                                .and_then(|out| String::from_utf8(out.stdout).ok())
-                                .map(|s| s.trim().to_owned()))
-                            .expect("need to specify SYSROOT env var, \
-                                     or use rustup or multirust")
-                    };
-                    args.push(sys_root.to_owned());
+                    if self.config.sysroot.is_empty() {
+                        args.push("--sysroot".to_owned());
+                        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 = if let (Some(home), Some(toolchain)) = (home, toolchain) {
+                            format!("{}/toolchains/{}", home, toolchain)
+                        } else {
+                            option_env!("SYSROOT")
+                                .map(|s| s.to_owned())
+                                .or_else(|| Command::new("rustc")
+                                    .arg("--print")
+                                    .arg("sysroot")
+                                    .output()
+                                    .ok()
+                                    .and_then(|out| String::from_utf8(out.stdout).ok())
+                                    .map(|s| s.trim().to_owned()))
+                                .expect("need to specify SYSROOT env var, \
+                                        or use rustup or multirust")
+                        };
+                        args.push(sys_root.to_owned());
+                    }
 
                     let envs = cmd.get_envs();
                     trace!("envs: {:?}", envs);
@@ -428,9 +430,13 @@ impl BuildQueue {
         // However, if Cargo doesn't run a separate thread, then we'll just wait
         // forever. Therefore, we spawn an extra thread here to be safe.
         let handle = thread::spawn(move || {
-            env::set_var("RUSTFLAGS",
-                         "-Zunstable-options -Zsave-analysis --error-format=json \
-                          -Zcontinue-parse-after-error");
+            let hardcoded = "-Zunstable-options -Zsave-analysis --error-format=json \
+                             -Zcontinue-parse-after-error";
+            if rls_config.sysroot.is_empty() {
+                env::set_var("RUSTFLAGS", hardcoded);
+            } else {
+                env::set_var("RUSTFLAGS", &format!("--sysroot {} {}", rls_config.sysroot, hardcoded));
+            }
 
             let shell = MultiShell::from_write(Box::new(BufWriter(out.clone())),
                                                Box::new(BufWriter(err.clone())));

src/config.rs

@@ -191,6 +191,7 @@ macro_rules! create_config {
 }
 
 create_config! {
+    sysroot: String, String::new(), false, "--sysroot";
     build_lib: bool, false, false, "cargo check --lib";
     cfg_test: bool, true, false, "build cfg(test) code";
     unstable_features: bool, false, false, "enable unstable features";