psa-crypto-sys: dedup build.rs

De-duplicate the build configuration for mbedtls.

Signed-off-by: Bill Roberts <[email protected]>

psa-crypto-sys/build.rs

@@ -140,40 +140,27 @@ 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 mut 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()
-            .map_err(|_| {
-                Error::new(
-                    ErrorKind::Other,
-                    "Unable to generate bindings to mbed crypto",
-                )
-            })?;
+        {
+            shim_builder = shim_builder.parse_callbacks(Box::new(RenameCallbacks {}));
+        }
+        // Build the bindings
+        let shim_bindings = shim_builder.generate().map_err(|_| {
+            Error::new(
+                ErrorKind::Other,
+                "Unable to generate bindings to mbed crypto",
+            )
+        })?;
 
         let out_path = PathBuf::from(env::var("OUT_DIR").unwrap());
         shim_bindings.write_to_file(out_path.join("shim_bindings.rs"))?;