diff --git a/boring-sys/build/config.rs b/boring-sys/build/config.rs index c40f611d..7f63b2fa 100644 --- a/boring-sys/build/config.rs +++ b/boring-sys/build/config.rs @@ -36,7 +36,6 @@ pub(crate) struct Env { pub(crate) android_ndk_home: Option, pub(crate) cmake_toolchain_file: Option, pub(crate) cpp_runtime_lib: Option, - pub(crate) docs_rs: bool, } impl Config { @@ -186,7 +185,6 @@ impl Env { android_ndk_home: target_var("ANDROID_NDK_HOME").map(Into::into), cmake_toolchain_file: target_var("CMAKE_TOOLCHAIN_FILE").map(Into::into), cpp_runtime_lib: target_var("BORING_BSSL_RUST_CPPLIB"), - docs_rs: var("DOCS_RS").is_some(), } } } diff --git a/boring-sys/build/main.rs b/boring-sys/build/main.rs index 9c144d0f..2c640f62 100644 --- a/boring-sys/build/main.rs +++ b/boring-sys/build/main.rs @@ -660,15 +660,8 @@ fn get_cpp_runtime_lib(config: &Config) -> Option { fn main() { let config = Config::from_env(); - if !config.env.docs_rs { - emit_link_directives(&config); - } - generate_bindings(&config); -} - -fn emit_link_directives(config: &Config) { - let bssl_dir = built_boring_source_path(config); - let build_path = get_boringssl_platform_output_path(config); + let bssl_dir = built_boring_source_path(&config); + let build_path = get_boringssl_platform_output_path(&config); if config.is_bazel || (config.features.is_fips_like() && config.env.path.is_some()) { println!( @@ -700,10 +693,10 @@ fn emit_link_directives(config: &Config) { } if config.features.fips_link_precompiled { - link_in_precompiled_bcm_o(config); + link_in_precompiled_bcm_o(&config); } - if let Some(cpp_lib) = get_cpp_runtime_lib(config) { + if let Some(cpp_lib) = get_cpp_runtime_lib(&config) { println!("cargo:rustc-link-lib={cpp_lib}"); } println!("cargo:rustc-link-lib=static=crypto"); @@ -713,15 +706,13 @@ fn emit_link_directives(config: &Config) { // Rust 1.87.0 compat - https://github.com/rust-lang/rust/pull/138233 println!("cargo:rustc-link-lib=advapi32"); } -} -fn generate_bindings(config: &Config) { let include_path = config.env.include_path.clone().unwrap_or_else(|| { if let Some(bssl_path) = &config.env.path { return bssl_path.join("include"); } - let src_path = get_boringssl_source_path(config); + let src_path = get_boringssl_source_path(&config); let candidate = src_path.join("include"); if candidate.exists() { @@ -755,7 +746,7 @@ fn generate_bindings(config: &Config) { .layout_tests(supports_layout_tests) .prepend_enum_name(true) .blocklist_type("max_align_t") // Not supported by bindgen on all targets, not used by BoringSSL - .clang_args(get_extra_clang_args_for_bindgen(config)) + .clang_args(get_extra_clang_args_for_bindgen(&config)) .clang_arg("-I") .clang_arg(include_path.display().to_string());