Merge #93

93: xtask: Replace rustc module with llvm-tools crate r=mkroening a=mkroening Co-authored-by: Martin Kröning <m.kroening@hotmail.de>
hermit-os · May 20, 2022 · 60378e7 · 60378e7
2 parents 0944b10 + 6778606
commit 60378e7
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 45 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/xtask/Cargo.toml b/xtask/Cargo.toml
@@ -5,6 +5,6 @@ edition = "2021"
 
 [dependencies]
 anyhow = "1.0"
-rustc_version = "0.4"
+llvm-tools = "0.1"
 xflags = "0.2"
 xshell = "0.2"
diff --git a/xtask/src/main.rs b/xtask/src/main.rs
@@ -1,7 +1,6 @@
 //! See <https://github.com/matklad/cargo-xtask/>.
 
 mod flags;
-mod rustc;
 
 use std::{
 	env::{self, VarError},
@@ -10,6 +9,7 @@ use std::{
 };
 
 use anyhow::{anyhow, bail, Result};
+use llvm_tools::LlvmTools;
 use xshell::{cmd, Shell};
 
 fn main() -> Result<()> {
@@ -210,8 +210,11 @@ fn binutil(name: &str) -> Result<PathBuf> {
 	let exe_suffix = env::consts::EXE_SUFFIX;
 	let exe = format!("llvm-{name}{exe_suffix}");
 
-	let mut path = rustc::rustlib()?;
-	path.push(exe);
+	let path = LlvmTools::new()
+		.map_err(|err| anyhow!("{err:?}"))?
+		.tool(&exe)
+		.ok_or_else(|| anyhow!("could not find {exe}"))?;
+
 	Ok(path)
 }
 

diff --git a/xtask/src/rustc.rs b/xtask/src/rustc.rs