min
/
boring2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Skip Rust version detection for bindgen

This commit is contained in:
Kornel 2025-09-26 11:45:40 +01:00 committed by Kornel
parent 9bad96e48b
commit 3116032a83
3 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Cargo.toml
View File

@ -48,5 +48,4 @@ openssl-macros = "0.1.1"
tower = "0.4" tower = "0.4"
tower-layer = "0.3" tower-layer = "0.3"
tower-service = "0.3" tower-service = "0.3"
autocfg = "1.3.0"
brotli = "6.0" brotli = "6.0"

2
boring-sys/Cargo.toml
View File

@ -13,6 +13,7 @@ build = "build/main.rs"
readme = "README.md" readme = "README.md"
categories = ["cryptography", "external-ffi-bindings"] categories = ["cryptography", "external-ffi-bindings"]
edition = { workspace = true } edition = { workspace = true }
rust-version = "1.77"
include = [ include = [
"/*.md", "/*.md",
"/*.toml", "/*.toml",
@ -89,7 +90,6 @@ pq-experimental = []
underscore-wildcards = [] underscore-wildcards = []
[build-dependencies] [build-dependencies]
autocfg = { workspace = true }
bindgen = { workspace = true } bindgen = { workspace = true }
cmake = { workspace = true } cmake = { workspace = true }
fs_extra = { workspace = true } fs_extra = { workspace = true }

10
boring-sys/build/main.rs
View File

@ -741,12 +741,8 @@ fn generate_bindings(config: &Config) {
} }
}); });
// bindgen 0.70 replaced the run-time layout tests with compile-time ones, let target_rust_version =
// but they depend on std::mem::offset_of, stabilized in 1.77. bindgen::RustTarget::stable(77, 0).expect("bindgen does not recognize target rust version");
let supports_layout_tests = autocfg::new().probe_rustc_version(1, 77);
let Ok(target_rust_version) = bindgen::RustTarget::stable(68, 0) else {
panic!("bindgen does not recognize target rust version");
};
let mut builder = bindgen::Builder::default() let mut builder = bindgen::Builder::default()
.rust_target(target_rust_version) // bindgen MSRV is 1.70, so this is enough .rust_target(target_rust_version) // bindgen MSRV is 1.70, so this is enough
@ -762,7 +758,7 @@ fn generate_bindings(config: &Config) {
.generate_comments(true) .generate_comments(true)
.fit_macro_constants(false) .fit_macro_constants(false)
.size_t_is_usize(true) .size_t_is_usize(true)
.layout_tests(supports_layout_tests) .layout_tests(config.env.debug.is_some())
.prepend_enum_name(true) .prepend_enum_name(true)
.blocklist_type("max_align_t") // Not supported by bindgen on all targets, not used by BoringSSL .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))