Skip to content

Commit 258064f

Browse files
committed
Bump cmake-rs to improve Mac OS build parallelism
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
1 parent e6833b0 commit 258064f

File tree

2 files changed

+1
-5
lines changed

2 files changed

+1
-5
lines changed

Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ tokio-boring = { version = "4.13.0", path = "./tokio-boring" }
2525

2626
bindgen = { version = "0.70.1", default-features = false, features = ["runtime"] }
2727
bytes = "1"
28-
cmake = "0.1.18"
28+
cmake = "0.1.54"
2929
fs_extra = "1.3.0"
3030
fslock = "0.2"
3131
bitflags = "2.4"

boring-sys/build/main.rs

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -576,10 +576,6 @@ fn built_boring_source_path(config: &Config) -> &PathBuf {
576576

577577
let mut cfg = get_boringssl_cmake_config(config);
578578

579-
if let Ok(threads) = std::thread::available_parallelism() {
580-
cfg.env("CMAKE_BUILD_PARALLEL_LEVEL", threads.to_string());
581-
}
582-
583579
if config.features.fips {
584580
let (clang, clangxx) = verify_fips_clang_version();
585581
cfg.define("CMAKE_C_COMPILER", clang)

0 commit comments

Comments
 (0)