Skip to content

Revert "Don't link binaries on docs.rs" #94

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
0x676e67 merged 1 commit into from
Aug 31, 2025
Merged

Revert "Don't link binaries on docs.rs" #94

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions boring-sys/build/config.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@ pub(crate) struct Env {
pub(crate) android_ndk_home: Option<PathBuf>,
pub(crate) cmake_toolchain_file: Option<PathBuf>,
pub(crate) cpp_runtime_lib: Option<OsString>,
pub(crate) docs_rs: bool,
}

impl Config {
Expand Down Expand Up @@ -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(),
}
}
}
Expand Down
21 changes: 6 additions & 15 deletions boring-sys/build/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -660,15 +660,8 @@ fn get_cpp_runtime_lib(config: &Config) -> Option<String> {

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!(
Expand Down Expand Up @@ -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");
Expand All @@ -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() {
Expand Down Expand Up @@ -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());

Expand Down
Loading