Make sysroot location configurable

Author: phil-opp

CHANGELOG.md

@@ -4,6 +4,7 @@ All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
 ## [Unreleased]
+- Add config option `sysroot_path` that defines where the sysroot should be placed. Defaults to the `target/sysroot`.
 
 ## [0.4.3] - 2018-05-31
 - Make behavior configurable through a `package.metadata.cargo-xbuild` table in the `Cargo.toml`

README.md

@@ -34,9 +34,11 @@ To configure `cargo-xbuild` create a `package.metadata.cargo-xbuild` table in yo
 ```toml
 [package.metadata.cargo-xbuild]
 memcpy = true
+sysroot_path = "target/sysroot"
 ```
 
 - The `memcpy` flag defines whether the `mem` feature of the `compiler_builtins` crate should be activated. Turning this flag off allows to specify own versions of the `memcpy`, `memset` etc. functions.
+- The `sysroot_path` flag specifies the directory where the sysroot should be placed.
 
 ## Dev channel
 

src/config.rs

@@ -4,12 +4,14 @@ use cargo_metadata;
 #[derive(Debug, Deserialize, Hash)]
 pub struct Config {
     pub memcpy: bool,
+    pub sysroot_path: Option<String>,
 }
 
 impl Default for Config {
     fn default() -> Self {
         Config {
             memcpy: true,
+            sysroot_path: None,
         }
     }
 }

src/help.txt

@@ -9,3 +9,13 @@ OPTIONS:
 
     Any additional options are directly passed to `cargo build` (see
     `cargo build --help` for possible options).
+
+CONFIGURATION:
+    Configuration is possible through a `package.metadata.cargo-xbuild` table
+    in your `Cargo.toml`:
+
+    [package.metadata.cargo-xbuild]
+    memcpy = true
+    sysroot_path = "target/sysroot"
+
+    See README.md for a description of these flags.

src/main.rs

@@ -193,7 +193,7 @@ fn build(args: cli::Args) -> Result<(ExitStatus)> {
     };
 
     if let Some(cmode) = cmode {
-        let home = xargo::home(target_directory)?;
+        let home = xargo::home(target_directory, &crate_config)?;
         let rustflags = cargo::rustflags(config.as_ref(), cmode.triple())?;
 
         sysroot::update(

src/xargo.rs

@@ -1,6 +1,6 @@
 use std::path::{Display, PathBuf};
 use std::process::{Command, ExitStatus};
-use std::mem;
+use std::{fs, mem};
 use std::io::{self, Write};
 use std::path::Path;
 
@@ -12,6 +12,7 @@ use cli::Args;
 use errors::*;
 use extensions::CommandExt;
 use flock::{FileLock, Filesystem};
+use config::Config;
 
 pub fn run(
     args: &Args,
@@ -68,11 +69,18 @@ impl Home {
     }
 }
 
-pub fn home(target_directory: &Path) -> Result<Home> {
-    let mut p = PathBuf::from(target_directory);
-    p.push("sysroot");
+pub fn home(target_directory: &Path, config: &Config) -> Result<Home> {
+    let path = if let Some(ref p) = config.sysroot_path {
+        let path = Path::new(p);
+        fs::create_dir_all(&path).map_err(|_| String::from("Could not create sysroot folder"))?;
+        path.canonicalize().map_err(|_| String::from("Invalid sysroot path"))?
+    } else {
+        let mut p = PathBuf::from(target_directory);
+        p.push("sysroot");
+        p
+    };
 
     Ok(Home {
-        path: Filesystem::new(p),
+        path: Filesystem::new(path),
     })
 }