Bug 1426788 - Don't fall back to ccache when sccache is not enabled. r?build draft
authorMike Hommey <mh+mozilla@glandium.org>
Fri, 22 Dec 2017 10:08:40 +0900
changeset 714266 fa42b9adc16d21ce8fcfe83a5c285e539562b93c
parent 713998 5b1fdaa14d35ddf1a638c9422786ede707cacf1f
child 744554 c7e93db70643d9035aa65883a8e5d8d97ed889a6
push id93883
push userbmo:mh+mozilla@glandium.org
push dateFri, 22 Dec 2017 01:10:19 +0000
reviewersbuild
bugs1426788
milestone59.0a1
Bug 1426788 - Don't fall back to ccache when sccache is not enabled. r?build ccache is not beneficial on taskcluster, don't try to use it when sccache is not enabled for some reason.
build/mozconfig.cache
--- a/build/mozconfig.cache
+++ b/build/mozconfig.cache
@@ -99,23 +99,17 @@ if test -z "$platform"; then
     case "${SYSTEMROOT}" in
     *Windows)
         platform=windows
         suffix=.exe
         ;;
     esac
 fi
 
-if test -z "$bucket"; then
-    case "$platform" in
-    win*) : ;;
-    *)
-        export CCACHE=ccache
-    esac
-else
+if test -n "$bucket"; then
     mk_add_options "export SCCACHE_BUCKET=$bucket"
     case "$master" in
     *us[ew][12].mozilla.com*|*euc1.mozilla.com*)
         mk_add_options "export SCCACHE_NAMESERVER=169.254.169.253"
         ;;
     esac
     export CCACHE="$topsrcdir/sccache2/sccache${suffix}"
     export SCCACHE_VERBOSE_STATS=1