musl-ldd

Author: geofft

src/validation.rs

@@ -2201,17 +2201,23 @@ fn verify_distribution_behavior(dist_path: &Path) -> Result<Vec<String>> {
     // that fails this check (e.g. by setting an rpath on just python+libpython).
     // https://github.com/pyinstaller/pyinstaller/issues/9204#issuecomment-3171050891
     if cfg!(target_os = "linux") {
+        // musl's ldd is packaged in the "musl-dev" Debian package.
+        let ldd = if python_json.target_triple.contains("-musl") && cfg!(not(target_env = "musl")) {
+            "musl-ldd"
+        } else {
+            "ldd"
+        };
         for (name, variants) in python_json.build_info.extensions.iter() {
             for ext in variants {
                 let Some(shared_lib) = &ext.shared_lib else {
                     continue;
                 };
                 let shared_lib_path = temp_dir.path().join("python").join(shared_lib);
-                let output = duct::cmd("ldd", [shared_lib_path])
+                let output = duct::cmd(ldd, [shared_lib_path])
                     .unchecked()
                     .stdout_capture()
                     .run()
-                    .context(format!("Failed to run `ldd {shared_lib}`"))?;
+                    .context(format!("Failed to run `{ldd} {shared_lib}`"))?;
                 let stdout = String::from_utf8_lossy(&output.stdout);
                 // Format of ldd output, for both glibc and musl:
                 // - Everything starts with a tab.
@@ -2229,7 +2235,7 @@ fn verify_distribution_behavior(dist_path: &Path) -> Result<Vec<String>> {
                     // TODO: If we ever have any optional dependencies besides libcrypt (which is
                     // glibc-only), we will need to capture musl ldd's stderr and parse it.
                     errors.push(format!(
-                        "`ldd {shared_lib}` exited with {}:\n{stdout}",
+                        "`{ldd} {shared_lib}` exited with {}:\n{stdout}",
                         output.status
                     ));
                 } else {
@@ -2241,7 +2247,9 @@ fn verify_distribution_behavior(dist_path: &Path) -> Result<Vec<String>> {
                             continue;
                         };
                         let dep_source = deps
-                            .and_then(|deps| deps.iter().find(|dep| dep.0 == needed).map(|dep| dep.1))
+                            .and_then(|deps| {
+                                deps.iter().find(|dep| dep.0 == needed).map(|dep| dep.1)
+                            })
                             .unwrap_or(SystemRequired);
                         if resolution.starts_with("not found") && dep_source != SystemOptional {
                             ldd_errors.push(format!("{needed} was expected to be found"));
@@ -2253,7 +2261,7 @@ fn verify_distribution_behavior(dist_path: &Path) -> Result<Vec<String>> {
                     }
                     if !ldd_errors.is_empty() {
                         errors.push(format!(
-                            "In `ldd {shared_lib}`:\n - {}\n{stdout}",
+                            "In `{ldd} {shared_lib}`:\n - {}\n{stdout}",
                             ldd_errors.join("\n - ")
                         ));
                     }