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

Revert cmake bump (for now) as it is overly restrictive (#321) 

Some users of boring have issues with newer versions of cmake. Because
we have an alternative solution, we can hold off on the bump for now.
This commit is contained in:
Rushil Mehra 2025-02-22 17:16:53 -08:00 committed by GitHub
parent abaf06731b
commit 7ba322560f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Cargo.toml
View File

@ -25,7 +25,7 @@ tokio-boring = { version = "4.14.0", path = "./tokio-boring" }
bindgen = { version = "0.70.1", default-features = false, features = ["runtime"] } bindgen = { version = "0.70.1", default-features = false, features = ["runtime"] }
bytes = "1" bytes = "1"
cmake = "0.1.54" cmake = "0.1.18"
fs_extra = "1.3.0" fs_extra = "1.3.0"
fslock = "0.2" fslock = "0.2"
bitflags = "2.4" bitflags = "2.4"

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

@ -576,6 +576,10 @@ fn built_boring_source_path(config: &Config) -> &PathBuf {
let mut cfg = get_boringssl_cmake_config(config); let mut cfg = get_boringssl_cmake_config(config);
if let Ok(threads) = std::thread::available_parallelism() {
cfg.env("CMAKE_BUILD_PARALLEL_LEVEL", threads.to_string());
}
if config.features.fips { if config.features.fips {
let (clang, clangxx) = verify_fips_clang_version(); let (clang, clangxx) = verify_fips_clang_version();
cfg.define("CMAKE_C_COMPILER", clang) cfg.define("CMAKE_C_COMPILER", clang)