Merge pull request #62 from rust-osdev/Zbuild-std

Add support for building bootloaders using `-Zbuild-std`

Author: phil-opp

src/builder/bootloader.rs

@@ -14,6 +14,7 @@ pub struct BuildConfig {
     target_dir: PathBuf,
     kernel_bin_path: PathBuf,
     kernel_manifest_path: PathBuf,
+    build_std: Option<String>,
 }
 
 impl BuildConfig {
@@ -54,6 +55,19 @@ impl BuildConfig {
                     .into(),
             )
         })?;
+        let build_std = {
+            let key = metadata
+                .and_then(|t| t.get("bootloader"))
+                .and_then(|t| t.get("build-std"));
+            if let Some(key) = key {
+                let err_msg = "A non-string `package.metadata.bootloader.build-std` key found in \
+                Cargo.toml of bootloader";
+                let err = || BootloaderError::BootloaderInvalid(err_msg.into());
+                Some(key.as_str().ok_or_else(err)?.into())
+            } else {
+                None
+            }
+        };
 
         let binary_feature = cargo_toml
             .get("features")
@@ -90,14 +104,19 @@ impl BuildConfig {
             target_dir,
             kernel_manifest_path: kernel_pkg.manifest_path.clone(),
             kernel_bin_path: kernel_bin_path.to_owned(),
+            build_std,
         })
     }
 
     /// Creates the cargo build command for building the bootloader.
     pub fn build_command(&self) -> Command {
         let cargo = std::env::var("CARGO").unwrap_or_else(|_| "cargo".to_owned());
         let mut cmd = Command::new(&cargo);
-        cmd.arg("xbuild");
+        if let Some(build_std) = &self.build_std {
+            cmd.arg("build").arg(&format!("-Zbuild-std={}", build_std));
+        } else {
+            cmd.arg("xbuild");
+        }
         cmd.arg("--manifest-path");
         cmd.arg(&self.manifest_path);
         cmd.arg("--bin").arg(&self.bootloader_name);