Use config.build_command instead of rlibc heuristic

This is a breaking change since it changes the default build command to `cargo build`.

Author: phil-opp

src/bin/cargo-bootimage.rs

@@ -2,7 +2,7 @@ use anyhow::{anyhow, Context, Result};
 use bootimage::{
     args::{BuildArgs, BuildCommand},
     builder::Builder,
-    help,
+    config, help,
 };
 use std::{
     env,
@@ -43,9 +43,10 @@ pub fn main() -> Result<()> {
 
 fn build(args: BuildArgs) -> Result<()> {
     let mut builder = Builder::new(args.manifest_path().map(PathBuf::from))?;
+    let config = config::read_config(builder.manifest_path())?;
     let quiet = args.quiet();
 
-    let executables = builder.build_kernel(&args.cargo_args(), quiet)?;
+    let executables = builder.build_kernel(&args.cargo_args(), &config, quiet)?;
     if executables.is_empty() {
         return Err(anyhow!("no executables built"));
     }

src/builder/mod.rs

@@ -1,5 +1,6 @@
 //! Provides functions to build the kernel and the bootloader.
 
+use crate::config::Config;
 use cargo_metadata::Metadata;
 use error::{BootloaderError, BuildKernelError, BuilderError, CreateBootimageError};
 use std::{
@@ -46,27 +47,17 @@ impl Builder {
     pub fn build_kernel(
         &mut self,
         args: &[String],
+        config: &Config,
         quiet: bool,
     ) -> Result<Vec<PathBuf>, BuildKernelError> {
         if !quiet {
             println!("Building kernel");
         }
 
-        let build_arg = if self
-            .project_metadata()
-            .ok()
-            .and_then(|m| m.packages.iter().find(|p| p.name == "rlibc"))
-            .is_some()
-        {
-            "build"
-        } else {
-            "xbuild"
-        };
-
         // try to run cargo xbuild
         let cargo = std::env::var("CARGO").unwrap_or_else(|_| "cargo".to_owned());
         let mut cmd = process::Command::new(&cargo);
-        cmd.arg(build_arg);
+        cmd.args(&config.build_command);
         cmd.args(args);
         if !quiet {
             cmd.stdout(process::Stdio::inherit());
@@ -77,7 +68,7 @@ impl Builder {
             error: err,
         })?;
         if !output.status.success() {
-            if build_arg == "xbuild" {
+            if config.build_command.starts_with(&["xbuild".into()]) {
                 // try executing `cargo xbuild --help` to check whether cargo-xbuild is installed
                 let mut help_command = process::Command::new("cargo");
                 help_command.arg("xbuild").arg("--help");
@@ -96,7 +87,7 @@ impl Builder {
 
         // Retrieve binary paths
         let mut cmd = process::Command::new(cargo);
-        cmd.arg(build_arg);
+        cmd.args(&config.build_command);
         cmd.args(args);
         cmd.arg("--message-format").arg("json");
         let output = cmd.output().map_err(|err| BuildKernelError::Io {

src/config.rs

@@ -12,9 +12,9 @@ use toml::Value;
 #[derive(Debug, Clone)]
 #[non_exhaustive]
 pub struct Config {
-    /// The command that is used for building the kernel for `cargo bootimage`.
+    /// The cargo subcommand that is used for building the kernel for `cargo bootimage`.
     ///
-    /// Defaults to `cargo build`.
+    /// Defaults to `build`.
     pub build_command: Vec<String>,
     /// The run command that is invoked on `bootimage run` or `bootimage runner`
     ///
@@ -128,9 +128,7 @@ struct ConfigBuilder {
 impl Into<Config> for ConfigBuilder {
     fn into(self) -> Config {
         Config {
-            build_command: self
-                .build_command
-                .unwrap_or(vec!["cargo".into(), "build".into()]),
+            build_command: self.build_command.unwrap_or(vec!["build".into()]),
             run_command: self.run_command.unwrap_or_else(|| {
                 vec![
                     "qemu-system-x86_64".into(),