psa-crypto-sys: dedup build.rs

De-duplicate the build configuration for mbedtls. Signed-off-by: Bill Roberts <[email protected]>
parallaxsecond · Dec 20, 2023 · f8ba20e · f8ba20e
1 parent e8cec13
commit f8ba20e
Showing 1 changed file with 7 additions and 20 deletions.
diff --git a/psa-crypto-sys/build.rs b/psa-crypto-sys/build.rs
@@ -137,34 +137,21 @@ mod common {
 
         let out_dir = env::var("OUT_DIR").unwrap();
 
-        #[cfg(not(feature = "prefix"))]
-        let shim_bindings = bindgen::Builder::default()
+        // Common shim builder settings
+        let shim_builder = bindgen::Builder::default()
             .clang_arg(format!("-I{}", out_dir))
             .clang_arg(format!("-DMBEDTLS_CONFIG_FILE={}", mbed_conf))
             .clang_arg(format!("-I{}", mbed_include_dir))
             .header("src/c/shim.h")
             .blocklist_type("max_align_t")
             .generate_comments(false)
-            .size_t_is_usize(true)
-            .generate()
-            .map_err(|_| {
-                Error::new(
-                    ErrorKind::Other,
-                    "Unable to generate bindings to mbed crypto",
-                )
-            })?;
+            .size_t_is_usize(true);
 
         #[cfg(feature = "prefix")]
-        let shim_bindings = bindgen::Builder::default()
-            .clang_arg(format!("-I{}", out_dir))
-            .clang_arg(format!("-DMBEDTLS_CONFIG_FILE={}", mbed_conf))
-            .clang_arg(format!("-I{}", mbed_include_dir))
-            .header("src/c/shim.h")
-            .blocklist_type("max_align_t")
-            .generate_comments(false)
-            .size_t_is_usize(true)
-            .parse_callbacks(Box::new(RenameCallbacks {}))
-            .generate()
+            shim_builder.parse_callbacks(Box::new(RenameCallbacks {}));
+
+        // Build the bindings
+        let shim_bindings = shim_builder.generate()
             .map_err(|_| {
                 Error::new(
                     ErrorKind::Other,