Merge branch 'main' of https://github.com/mozilla/sccache

Cargo.toml

@@ -23,16 +23,16 @@ lto = true
 strip = true
 
 [dependencies]
-anyhow = "1.0"
+anyhow = { version = "1.0", features = ["backtrace"] }
 ar = "0.9"
 async-trait = "0.1"
 base64 = "0.21"
 bincode = "1"
 blake3 = "1"
 byteorder = "1.0"
 bytes = "1"
-opendal = { version= "0.34.0", optional = true }
-reqsign = {version="0.10.1", optional = true}
+opendal = { version= "0.36.0", optional = true }
+reqsign = { version = "0.12.0", optional = true }
 clap = { version = "4.1.11", features = ["derive", "env", "wrap_help"] }
 directories = "5.0.0"
 encoding = "0.2"
@@ -86,6 +86,8 @@ nix = { version = "0.26.2", optional = true }
 rouille = { version = "3.5", optional = true, default-features = false, features = ["ssl"] }
 syslog = { version = "6", optional = true }
 version-compare = { version = "0.1.1", optional = true }
+object = "0.30"
+memmap2 = "0.6.2"
 
 [dev-dependencies]
 assert_cmd = "2.0.10"
@@ -95,6 +97,7 @@ itertools = "0.10"
 predicates = "=3.0.2"
 thirtyfour_sync = "0.27"
 serial_test = "2.0"
+temp-env = "0.3.4"
 
 [target.'cfg(unix)'.dependencies]
 daemonize = "0.5"

docs/Caching.md

@@ -25,7 +25,10 @@ In parallel, we also take into account in the hash:
 For C/C++, the hash is generated with a blake3 digest of the preprocessed
 file (-E with gcc/clang). For compilations that specify multiple `-arch` flags,
 these flags are rewritten to their corresponding preprocessor defines to allow 
-pre-processing the file (e.g `-arch x86_64` is rewritten to `-D__X86_64__=1`).
+pre-processing the file (e.g `-arch x86_64` is rewritten to `-D__X86_64__=1`),
+this can be enabled by setting the environment variable
+`SCCACHE_CACHE_MULTIARCH` but is disabled by default as it may not work in all
+cases.
 
 We also take into account in the hash:
 * Hash of the compiler binary

docs/Configuration.md

@@ -75,6 +75,7 @@ configuration variables
 * `SCCACHE_STARTUP_NOTIFY` specify a path to a socket which will be used for server completion notification
 * `SCCACHE_MAX_FRAME_LENGTH` how much data can be transferred between client and server
 * `SCCACHE_NO_DAEMON` set to `1` to disable putting the server to the background
+* `SCCACHE_CACHE_MULTIARCH` to disable caching of multi architecture builds.
 
 ### cache configs