Skip to content

Commit ef40a69

Browse files
committed
Remove cargo fetch step
We no longer need this step because bootloader is now a normal dependency.
1 parent 8746c15 commit ef40a69

File tree

1 file changed

+1
-16
lines changed

1 file changed

+1
-16
lines changed

src/subcommand/build.rs

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
use crate::{args::Args, builder::Builder, config, ErrorMessage};
2-
use std::{path::PathBuf, process};
2+
use std::path::PathBuf;
33

44
pub(crate) fn build(mut args: Args) -> Result<(), ErrorMessage> {
55
let builder = Builder::new(args.manifest_path().clone())?;
@@ -15,8 +15,6 @@ pub(crate) fn build_impl(
1515
args: &Args,
1616
quiet: bool,
1717
) -> Result<Vec<PathBuf>, ErrorMessage> {
18-
run_cargo_fetch(&args).map_err(|()| "cargo fetch failed")?;
19-
2018
let executables = builder.build_kernel(&args.cargo_args, quiet)?;
2119
if executables.len() == 0 {
2220
Err("no executables built")?;
@@ -40,16 +38,3 @@ pub(crate) fn build_impl(
4038
Ok(bootimages)
4139
}
4240

43-
fn run_cargo_fetch(args: &Args) -> Result<(), ()> {
44-
let mut command = process::Command::new("cargo");
45-
command.arg("fetch");
46-
if let Some(manifest_path) = args.manifest_path() {
47-
command.arg("--manifest-path");
48-
command.arg(manifest_path);
49-
}
50-
if command.status().map(|s| s.success()).unwrap_or(false) {
51-
Ok(())
52-
} else {
53-
Err(())
54-
}
55-
}

0 commit comments

Comments
 (0)