Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
85 changes: 45 additions & 40 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ mimalloc-pprof = "0.9"
# something the shipped daemon links. The version MUST equal the
# `running-process` rev pinned above, for the same `rp_*_public`
# symbol-duplication reason documented there.
running-process-probe-daemon = "=4.10.14"
running-process-probe-daemon = "=4.10.16"
object = { version = "0.36", default-features = false, features = ["read", "std", "elf", "write"] }
rusqlite = { version = "0.32", features = ["bundled"] }
shell-words = "1"
Expand Down Expand Up @@ -196,13 +196,13 @@ owo-colors = "4"
# loopback-HTTP path (see crates/fbuild-daemon/src/broker).
#
# Source must match zccache's `running-process` pin exactly (same source and
# version, not just the same semver; zccache takes =4.10.14 from crates.io). `running-process` exports unmangled `rp_*_public` C
# version, not just the same semver; zccache takes =4.10.16 from crates.io). `running-process` exports unmangled `rp_*_public` C
# symbols; Cargo treats a registry package and a git package as two distinct
# packages, so a registry pin here plus zccache's git pin puts BOTH copies in
# the link and every one of those symbols collides (`rust-lld: error:
# duplicate symbol: rp_native_process_start_public`, …). Keep this pin in
# lockstep with zccache's resolved `running-process` when repinning zccache.
running-process = { version = "=4.10.14", default-features = false, features = ["client-async"] }
running-process = { version = "=4.10.16", default-features = false, features = ["client-async"] }

[profile.dev]
debug = "line-tables-only"
Expand Down
2 changes: 1 addition & 1 deletion crates/fbuild-build-arm/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ tar = { workspace = true }
zip = { workspace = true }
tree-sitter = { workspace = true }
tree-sitter-cpp = { workspace = true }
zccache = { git = "https://github.com/zackees/zccache", rev = "b385a7bfb308c2d1456613622ad361eb66d31cdd" }
zccache = { git = "https://github.com/zackees/zccache", rev = "15ec9537af0d219e07b72ce2b3f97d5f68d72b5e" }

[dev-dependencies]
filetime = { workspace = true }
Expand Down
2 changes: 1 addition & 1 deletion crates/fbuild-build-engine/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ tar = { workspace = true }
zip = { workspace = true }
tree-sitter = { workspace = true }
tree-sitter-cpp = { workspace = true }
zccache = { git = "https://github.com/zackees/zccache", rev = "b385a7bfb308c2d1456613622ad361eb66d31cdd" }
zccache = { git = "https://github.com/zackees/zccache", rev = "15ec9537af0d219e07b72ce2b3f97d5f68d72b5e" }

[dev-dependencies]
filetime = { workspace = true }
Expand Down
2 changes: 1 addition & 1 deletion crates/fbuild-build-esp/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ tar = { workspace = true }
zip = { workspace = true }
tree-sitter = { workspace = true }
tree-sitter-cpp = { workspace = true }
zccache = { git = "https://github.com/zackees/zccache", rev = "b385a7bfb308c2d1456613622ad361eb66d31cdd" }
zccache = { git = "https://github.com/zackees/zccache", rev = "15ec9537af0d219e07b72ce2b3f97d5f68d72b5e" }

[dev-dependencies]
filetime = { workspace = true }
Expand Down
2 changes: 1 addition & 1 deletion crates/fbuild-build-mcu/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ tar = { workspace = true }
zip = { workspace = true }
tree-sitter = { workspace = true }
tree-sitter-cpp = { workspace = true }
zccache = { git = "https://github.com/zackees/zccache", rev = "b385a7bfb308c2d1456613622ad361eb66d31cdd" }
zccache = { git = "https://github.com/zackees/zccache", rev = "15ec9537af0d219e07b72ce2b3f97d5f68d72b5e" }

[dev-dependencies]
filetime = { workspace = true }
Expand Down
4 changes: 2 additions & 2 deletions crates/fbuild-build/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -52,13 +52,13 @@ tree-sitter-cpp = { workspace = true }
# work: #1768's heartbeat-free compile requests, #1770's mtime-floor skip on
# C/C++ hits, #1761/#1763's dropped durability syncs, #1775 unchanged-state
# shutdown skip), which takes
# running-process =4.10.14 from crates.io. Keep both pins aligned when
# running-process =4.10.16 from crates.io. Keep both pins aligned when
# repinning so fbuild links exactly one copy of the exported broker symbols.
#
# `running-process` in the workspace root must be pinned to the SAME source
# and version zccache uses, or its unmangled `rp_*_public` C symbols get
# linked twice (guarded by crates/fbuild-core/tests/dep_identity.rs).
zccache = { git = "https://github.com/zackees/zccache", rev = "b385a7bfb308c2d1456613622ad361eb66d31cdd" }
zccache = { git = "https://github.com/zackees/zccache", rev = "15ec9537af0d219e07b72ce2b3f97d5f68d72b5e" }

[dev-dependencies]
filetime = { workspace = true }
Expand Down
Loading