Merge pull request #506 from victor-dumitrescu/build

build.rs: check that cargo binary exists, use exported one otherwise
hermit-os · Nov 28, 2023 · 0def056 · 0def056
2 parents 892dd44 + 5aa584a
commit 0def056
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/hermit/build.rs b/hermit/build.rs
@@ -168,7 +168,11 @@ fn cargo() -> Command {
 		// To reach the rustup proxy nonetheless, we explicitly query $CARGO_HOME.
 		let mut cargo_home = PathBuf::from(env::var_os("CARGO_HOME").unwrap());
 		cargo_home.push("bin/cargo");
-		cargo_home
+		if cargo_home.exists() {
+			cargo_home
+		} else {
+			PathBuf::from("cargo")
+		}
 	};
 
 	let mut cargo = Command::new(cargo);