Skip to content

Commit

Permalink
Bump cmake-rs to improve Mac OS build parallelism
Browse files Browse the repository at this point in the history
There's a bug on OSX that prevents the CMake jobserver from working
properly, and so CMake defaults to a single-threaded build. It's not
clear when this is actually going to get fixed, so recent versions of
cmake-rs just disable the jobserver and have CMake fall back to the
number of available cores:
rust-lang/cmake-rs#229

This means we don't need e6833b0
  • Loading branch information
rushilmehra committed Feb 19, 2025
1 parent e6833b0 commit 258064f
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 5 deletions.
2 changes: 1 addition & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ tokio-boring = { version = "4.13.0", path = "./tokio-boring" }

bindgen = { version = "0.70.1", default-features = false, features = ["runtime"] }
bytes = "1"
cmake = "0.1.18"
cmake = "0.1.54"
fs_extra = "1.3.0"
fslock = "0.2"
bitflags = "2.4"
Expand Down
4 changes: 0 additions & 4 deletions boring-sys/build/main.rs
Original file line number Diff line number Diff line change
Expand Up @@ -576,10 +576,6 @@ fn built_boring_source_path(config: &Config) -> &PathBuf {

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 {
let (clang, clangxx) = verify_fips_clang_version();
cfg.define("CMAKE_C_COMPILER", clang)
Expand Down

0 comments on commit 258064f

Please sign in to comment.