diff options
| author | Corey Farwell <coreyf@rwell.org> | 2017-04-11 18:36:16 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-11 18:36:16 -0400 |
| commit | 828ed96377ff89051ff537afff74f768e6eea3c5 (patch) | |
| tree | 25d4e9814f2152e815381a963a1acefbb9babc15 | |
| parent | 704cbad2487b25e38b7be1874d0da7268f81a1f1 (diff) | |
| parent | f297767b2c262e8542a4734a3f47b0a75502c9fd (diff) | |
Rollup merge of #41209 - aidanhs:aphs-quiet-sccache, r=alexcrichton
Make sccache a bit quieter ...and remove the single mention of `SCCACHE_LOG_LEVEL` that would only take effect on Docker (i.e. Linux) builds since it had no effect anyway (because [`RUST_LOG` takes priority](https://github.com/mozilla/sccache/blob/ec10cdb2ddeb3dde9891bea1fa095e504a60a28a/src/main.rs#L124-L128)). r? @frewsxcv
| -rw-r--r-- | src/bootstrap/native.rs | 2 | ||||
| -rwxr-xr-x | src/ci/docker/run.sh | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/src/bootstrap/native.rs b/src/bootstrap/native.rs index 62eed8be3cc..726e94e49a1 100644 --- a/src/bootstrap/native.rs +++ b/src/bootstrap/native.rs @@ -147,7 +147,7 @@ pub fn llvm(build: &Build, target: &str) { } if env::var_os("SCCACHE_ERROR_LOG").is_some() { - cfg.env("RUST_LOG", "sccache=debug"); + cfg.env("RUST_LOG", "sccache=info"); } // FIXME: we don't actually need to build all LLVM tools and all LLVM diff --git a/src/ci/docker/run.sh b/src/ci/docker/run.sh index 71a4bfae3ca..59b93b784b2 100755 --- a/src/ci/docker/run.sh +++ b/src/ci/docker/run.sh @@ -38,7 +38,6 @@ if [ "$SCCACHE_BUCKET" != "" ]; then args="$args --env AWS_ACCESS_KEY_ID=$AWS_ACCESS_KEY_ID" args="$args --env AWS_SECRET_ACCESS_KEY=$AWS_SECRET_ACCESS_KEY" args="$args --env SCCACHE_ERROR_LOG=/tmp/sccache/sccache.log" - args="$args --env SCCACHE_LOG_LEVEL=debug" args="$args --volume $objdir/tmp:/tmp/sccache" else mkdir -p $HOME/.cache/sccache |