From dde67d22f62f41102507d5bd65894dc79b46bf95 Mon Sep 17 00:00:00 2001
From: Thibaut Lorrain <fredszaq@gmail.com>
Date: Tue, 19 Sep 2023 17:31:13 +0200
Subject: [PATCH] properly pass binding_crate_lib_name to java backend

---
 src/bindgen/builder.rs | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/bindgen/builder.rs b/src/bindgen/builder.rs
index 2ea93e82a..bc83731b1 100644
--- a/src/bindgen/builder.rs
+++ b/src/bindgen/builder.rs
@@ -375,6 +375,8 @@ impl Builder {
             result.extend_with(&parser::parse_src(x, &self.config)?);
         }
 
+        let binding_crate_lib_name;
+
         if let Some((lib_dir, binding_lib_name)) = self.lib.clone() {
             let lockfile = self.lockfile.as_ref().and_then(|p| p.to_str());
 
@@ -388,9 +390,14 @@ impl Builder {
                 /* existing_metadata = */ None,
             )?;
 
+            binding_crate_lib_name = cargo.binding_crate_lib_name().to_string();
+
             result.extend_with(&parser::parse_lib(cargo, &self.config)?);
         } else if let Some(cargo) = self.lib_cargo.clone() {
+            binding_crate_lib_name = cargo.binding_crate_lib_name().to_string();
             result.extend_with(&parser::parse_lib(cargo, &self.config)?);
+        } else {
+            binding_crate_lib_name = String::new()
         }
 
         result.source_files.extend_from_slice(self.srcs.as_slice());
@@ -406,9 +413,7 @@ impl Builder {
             result.typedefs,
             result.functions,
             result.source_files,
-            self.lib_cargo
-                .map(|cargo| cargo.binding_crate_lib_name().to_string())
-                .unwrap_or_default(),
+            binding_crate_lib_name,
         )
         .generate()
     }