Skip to content

Commit

Permalink
Bug 1911714 - Enable sccache on base-toolchains-clang tasks. r=firefo…
Browse files Browse the repository at this point in the history
…x-build-system-reviewers,sergesanspaille

It was disabled in bug 1525760 because of rust-lang/rust#58393
but since then we actually implemented a workaround (in bug 1601704)

That workaround, however, is also needed on the newly added
crashreporter crate.

Ironically, if these tasks had had sccache enabled in the first place,
bug 1911513 wouldn't have been caught.

Differential Revision: https://phabricator.services.mozilla.com/D218611
  • Loading branch information
glandium committed Aug 7, 2024
1 parent 803518c commit 9b36dad
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 0 deletions.
1 change: 1 addition & 0 deletions Cargo.lock

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

4 changes: 4 additions & 0 deletions taskcluster/kinds/build/linux-base-toolchains.yml
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,7 @@ linux64-base-toolchains-clang/opt:
script: "mozharness/scripts/fx_desktop_build.py"
secrets: true
tooltool-downloads: public
use-sccache: true
fetches:
toolchain:
- linux64-binutils-2.31.1
Expand All @@ -130,6 +131,7 @@ linux64-base-toolchains-clang/opt:
- linux64-nasm-2.14.02
- linux64-node-12
- linux64-pkgconf
- linux64-sccache
- sysroot-x86_64-linux-gnu
- sysroot-wasm32-wasi-clang-8.0

Expand Down Expand Up @@ -159,6 +161,7 @@ linux64-base-toolchains-clang/debug:
custom-build-variant-cfg: debug
mozconfig-variant: debug
tooltool-downloads: public
use-sccache: true
fetches:
toolchain:
- linux64-binutils-2.31.1
Expand All @@ -169,5 +172,6 @@ linux64-base-toolchains-clang/debug:
- linux64-nasm-2.14.02
- linux64-node-12
- linux64-pkgconf
- linux64-sccache
- sysroot-x86_64-linux-gnu
- sysroot-wasm32-wasi-clang-8.0
3 changes: 3 additions & 0 deletions toolkit/crashreporter/client/app/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,9 @@ unic-langid = { version = "0.9.1" }
uuid = { version = "1", features = ["v4", "serde"] }
zip = { version = "2.1.2", default-features = false }

# Workarounds for https://github.com/rust-lang/rust/issues/58393
lmdb-rkv-sys = "0.11"

[target."cfg(target_os = \"macos\")".dependencies]
block = "0.1"
cocoa = { package = "cocoabind", path = "../cocoabind" }
Expand Down

0 comments on commit 9b36dad

Please sign in to comment.