Bug 988774 - Do not gracefully disable sccache when it's not there. r=bhearsum
authorMike Hommey <mh+mozilla@glandium.org>
Sat, 29 Mar 2014 07:50:08 +0900
changeset 194508 05a22543378bacadca314c7e8d1603ab742df2ac
parent 194507 8245a010d297fcf66daf17705f17412dea8647d5
child 194509 ca413634eba3d4b9d7c493a6da41c78ab869b2c0
push id3624
push userasasaki@mozilla.com
push dateMon, 09 Jun 2014 21:49:01 +0000
treeherdermozilla-beta@b1a5da15899a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbhearsum
bugs988774
milestone31.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 988774 - Do not gracefully disable sccache when it's not there. r=bhearsum
build/mozconfig.cache
--- a/build/mozconfig.cache
+++ b/build/mozconfig.cache
@@ -4,17 +4,17 @@
 
 # Setup for build cache
 
 read branch platform master <<EOF
 $(python2.7 -c 'import json; p = json.loads(open("'"$topsrcdir"'/../buildprops.json").read())["properties"]; print p["branch"], p["platform"], p["master"]' 2> /dev/null)
 EOF
 
 bucket=
-if test -z "$SCCACHE_DISABLE" -a -f "$topsrcdir/sccache/sccache.py"; then
+if test -z "$SCCACHE_DISABLE" -a -z "$no_tooltool"; then
     case "${branch}_${master}" in
     try_*use1.mozilla.com*)
         bucket=mozilla-releng-s3-cache-us-east-1-try
         ;;
     try_*usw2.mozilla.com*)
         bucket=mozilla-releng-s3-cache-us-west-2-try
         ;;
     esac