Bug 1181040 - Always disable sccache when doing PGO builds. r=gps
authorMike Hommey <mh+mozilla@glandium.org>
Thu, 06 Aug 2015 16:33:28 +0900
changeset 288365 c24075996e1d36cdfa53dc17f464e80a9f1a798b
parent 288364 06de69c7ea12d4eb8daaa07359eeb0519afde981
child 288366 d1c8f4aeedef5d582b88fa84a1a4934fdf89b808
push id5067
push userraliiev@mozilla.com
push dateMon, 21 Sep 2015 14:04:52 +0000
treeherdermozilla-beta@14221ffe5b2f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgps
bugs1181040
milestone42.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 1181040 - Always disable sccache when doing PGO builds. r=gps
build/mozconfig.cache
--- a/build/mozconfig.cache
+++ b/build/mozconfig.cache
@@ -7,17 +7,17 @@
 # Avoid duplication if the file happens to be included twice.
 if test -z "$bucket"; then
 
 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 -z "$no_sccache"; then
+if test -z "$SCCACHE_DISABLE" -a -z "$no_sccache" -a -z "$MOZ_PGO_IS_SET"; then
     case "${branch}" in
     try)
         case "${master}" in
         *scl1.mozilla.com*|*.scl3.mozilla.com*)
             bucket=mozilla-releng-s3-cache-us-west-1-try
             ;;
         *use1.mozilla.com*)
             bucket=mozilla-releng-s3-cache-us-east-1-try
@@ -25,24 +25,20 @@ if test -z "$SCCACHE_DISABLE" -a -z "$no
         *usw2.mozilla.com*)
             bucket=mozilla-releng-s3-cache-us-west-2-try
             ;;
         esac
         ;;
     b2g-inbound|mozilla-inbound|fx-team)
         case "${master}" in
         *use1.mozilla.com*)
-            if test -z "$MOZ_PGO"; then
-                bucket=mozilla-releng-s3-cache-us-east-1-prod
-            fi
+            bucket=mozilla-releng-s3-cache-us-east-1-prod
             ;;
         *usw2.mozilla.com*)
-            if test -z "$MOZ_PGO"; then
-                bucket=mozilla-releng-s3-cache-us-west-2-prod
-            fi
+            bucket=mozilla-releng-s3-cache-us-west-2-prod
             ;;
         esac
         ;;
     esac
 fi
 
 if test -z "$bucket"; then
     case "$platform" in