diff --git a/Cargo.lock b/Cargo.lock index 47642376..080fa271 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3563,9 +3563,9 @@ dependencies = [ [[package]] name = "running-process" -version = "4.5.7" +version = "4.5.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4cc9c5f443f6e2af5fa401ab865b862902b769820da1e3b2b2b9bdab658982f9" +checksum = "6cfb64bf8432bcd3f842ba48536bb7218d83ac7fe24fd50f62f07a5e01618472" dependencies = [ "anyhow", "blake3", @@ -4258,26 +4258,6 @@ dependencies = [ "cfg-if", ] -[[package]] -name = "tikv-jemalloc-sys" -version = "0.7.1+5.3.1-0-g81034ce1f1373e37dc865038e1bc8eeecf559ce8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a2825c78386b4ae0314074867860ba9577875de945f05992c38815cbec327f0" -dependencies = [ - "cc", - "libc", -] - -[[package]] -name = "tikv-jemallocator" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "249f09e49ab1609436f34c776e84231bead18d6a955f119f939bdc1d847561bd" -dependencies = [ - "libc", - "tikv-jemalloc-sys", -] - [[package]] name = "time" version = "0.3.51" @@ -5560,8 +5540,8 @@ dependencies = [ [[package]] name = "zccache" -version = "1.12.11" -source = "git+https://github.com/zackees/zccache?rev=73d3f84542deb16f762352668f3f2a8fb407462a#73d3f84542deb16f762352668f3f2a8fb407462a" +version = "1.12.14" +source = "git+https://github.com/zackees/zccache?rev=4b13676bb3a76c87d2272b2d9ccb76e821734762#4b13676bb3a76c87d2272b2d9ccb76e821734762" dependencies = [ "arc-swap", "bincode", @@ -5604,7 +5584,6 @@ dependencies = [ "tar", "tempfile", "thiserror 2.0.18", - "tikv-jemallocator", "tokio", "tokio-util", "tracing", diff --git a/crates/fbuild-build/Cargo.toml b/crates/fbuild-build/Cargo.toml index e119d115..db97dd62 100644 --- a/crates/fbuild-build/Cargo.toml +++ b/crates/fbuild-build/Cargo.toml @@ -38,9 +38,12 @@ tree-sitter-cpp = { workspace = true } # child processes) was deleted in the same PR; there is no # `--no-default-features` escape hatch. # -# Pinned at the same revision soldr uses (`73d3f84`, -# zackees/soldr#994 + zccache#922/#923/#925/#926). -zccache = { git = "https://github.com/zackees/zccache", rev = "73d3f84542deb16f762352668f3f2a8fb407462a" } +# Pinned at zccache 1.12.14 (`4b13676`, the same revision soldr's +# `_vender/zccache` submodule uses). Bumps 1.12.11 -> 1.12.14 to pick +# up the embedded-path fixes: #950 (journal compile outcomes on the +# embedded path), #955/#957/#958 (daemon-deadlock/full-codegen fix + +# `run_cpu_blocking`), and #948 (mimalloc as sole allocator). +zccache = { git = "https://github.com/zackees/zccache", rev = "4b13676bb3a76c87d2272b2d9ccb76e821734762" } [dev-dependencies] filetime = { workspace = true }