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:
https://github.com/rust-lang/cmake-rs/pull/229
This means we don't need e6833b0074
This commit is contained in:
parent
3b5fa65860
commit
c3c7e16b9d
|
|
@ -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"
|
||||
|
|
|
|||
|
|
@ -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)
|
||||
|
|
|
|||
Loading…
Reference in New Issue