Merge pull request #5 from raviqqe/bug/library-strip

Fix library name trimming
femtomc · Jul 12, 2022 · 10fba89 · 10fba89
2 parents 100fb72 + 89c0911
commit 10fba89
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 9 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/build.rs b/build.rs
@@ -35,18 +35,16 @@ fn run() -> Result<(), Box<dyn Error>> {
                     .iter()
                     .any(|pattern| name.contains(pattern))
         {
-            println!(
-                "cargo:rustc-link-lib=static={}",
-                name.trim_start_matches("lib").trim_end_matches(".a")
-            );
+            if let Some(name) = trim_library_name(&name) {
+                println!("cargo:rustc-link-lib=static={}", name);
+            }
         }
     }
 
     for name in llvm_config("--libnames")?.trim().split(' ') {
-        println!(
-            "cargo:rustc-link-lib={}",
-            name.trim_start_matches("lib").trim_end_matches(".a")
-        );
+        if let Some(name) = trim_library_name(name) {
+            println!("cargo:rustc-link-lib={}", name);
+        }
     }
 
     for flag in llvm_config("--system-libs")?.trim().split(' ') {
@@ -92,3 +90,11 @@ fn llvm_config(argument: &str) -> Result<String, Box<dyn Error>> {
     .trim()
     .to_string())
 }
+
+fn trim_library_name(name: &str) -> Option<&str> {
+    if let Some(name) = name.strip_prefix("lib") {
+        name.strip_suffix(".a")
+    } else {
+        None
+    }
+}