Don't error out on non-existent LD path

Helps with PyO3/maturin#793
messense · Feb 4, 2022 · c7a3007 · c7a3007
1 parent 09d9cef
commit c7a3007
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 8 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/src/lib.rs b/src/lib.rs
@@ -182,21 +182,23 @@ impl DependencyAnalyzer {
         for path in ld_path.split(':') {
             let normpath = if path.is_empty() {
                 // The ldso treats empty paths as the current directory
-                env::current_dir()?
+                env::current_dir()
             } else if path.contains("$ORIGIN") || path.contains("${ORIGIN}") {
                 let elf_path = elf_path.canonicalize()?;
                 let elf_dir = elf_path.parent().expect("no parent");
                 let replacement = elf_dir.to_str().unwrap();
                 let path = path
                     .replace("${ORIGIN}", replacement)
                     .replace("$ORIGIN", replacement);
-                PathBuf::from(path).canonicalize()?
+                PathBuf::from(path).canonicalize()
             } else {
                 self.root
                     .join(path.strip_prefix('/').unwrap_or(path))
-                    .canonicalize()?
+                    .canonicalize()
             };
-            paths.push(normpath.display().to_string());
+            if let Ok(normpath) = normpath {
+                paths.push(normpath.display().to_string());
+            }
         }
         Ok(paths)
     }