From 596802d991f73def0cebfe472a5a5087972f74ed Mon Sep 17 00:00:00 2001 From: Dave Rolsky Date: Wed, 25 Dec 2024 15:54:42 -0600 Subject: [PATCH] Simplify check for whether system is `musl` Now it runs `ldd --version` instead of `ldd ls`. --- ubi/src/builder.rs | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/ubi/src/builder.rs b/ubi/src/builder.rs index 71fdfe5..c03ec55 100644 --- a/ubi/src/builder.rs +++ b/ubi/src/builder.rs @@ -312,14 +312,11 @@ fn platform_is_musl(platform: &Platform) -> bool { return false; } - let Ok(ls) = which("ls") else { - return false; - }; let Ok(ldd) = which("ldd") else { return false; }; - let Ok(output) = std::process::Command::new(ldd).arg(ls).output() else { + let Ok(output) = std::process::Command::new(ldd).arg("--version").output() else { return false; }; output.status.success() && String::from_utf8_lossy(&output.stdout).contains("musl")