From b48375960a7f7768015332d824dca932e984125b Mon Sep 17 00:00:00 2001 From: Marijn Suijten Date: Mon, 2 May 2022 19:51:20 +0200 Subject: [PATCH] llvm: Switch from `llvm-readelf` to `llvm-readobj` --- xbuild/src/command/doctor.rs | 2 +- xcommon/src/llvm.rs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/xbuild/src/command/doctor.rs b/xbuild/src/command/doctor.rs index 3bdf2a32..0b7727e6 100644 --- a/xbuild/src/command/doctor.rs +++ b/xbuild/src/command/doctor.rs @@ -18,7 +18,7 @@ impl Default for Doctor { Check::new("clang++", Some(VersionCheck::new("--version", 0, 2))), Check::new("llvm-ar", None), Check::new("llvm-lib", None), - Check::new("llvm-readelf", Some(VersionCheck::new("--version", 1, 4))), + Check::new("llvm-readobj", Some(VersionCheck::new("--version", 1, 4))), Check::new("lld", Some(VersionCheck::new("-flavor ld --version", 0, 1))), Check::new("lld-link", Some(VersionCheck::new("--version", 0, 1))), Check::new("lldb", Some(VersionCheck::new("--version", 0, 2))), diff --git a/xcommon/src/llvm.rs b/xcommon/src/llvm.rs index 850b9b01..a97afe10 100644 --- a/xcommon/src/llvm.rs +++ b/xcommon/src/llvm.rs @@ -69,7 +69,7 @@ pub fn list_needed_libs_recursively( /// List all required shared libraries as per the dynamic section fn list_needed_libs(library_path: &Path) -> Result> { - let mut readelf = Command::new("llvm-readelf"); + let mut readelf = Command::new("llvm-readobj"); let readelf = readelf.arg("--needed-libs").arg(library_path); let output = readelf .output() @@ -81,7 +81,7 @@ fn list_needed_libs(library_path: &Path) -> Result> { output.status ); let output = std::str::from_utf8(&output.stdout).unwrap(); - let output = output.strip_prefix("NeededLibraries [\n").unwrap(); + let (_, output) = output.split_once("NeededLibraries [\n").unwrap(); let output = output.strip_suffix("]\n").unwrap(); let mut needed = HashSet::new();