Keep build/ in sync. rs=bustage-fix
authoraleth <aleth@instantbird.org>
Thu, 03 Dec 2015 15:10:32 +0100
changeset 23740 00b6674a19598a74ba2758a6ba7a673d8a90d905
parent 23739 085890d69e693152d3504d14db26d47e3ca74fca
child 23741 c73ce0b62910d7b4d0e8a4635261a749cdf0b28d
push id1564
push userclokep@gmail.com
push dateMon, 25 Jan 2016 18:47:24 +0000
treeherdercomm-beta@dec4b138be1d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbustage-fix
Keep build/ in sync. rs=bustage-fix
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" -a -z "$MOZ_PGO_IS_SET"; then
+if test -z "$SCCACHE_DISABLE" -a -z "$no_sccache" -a -z "$MOZ_PGO_IS_SET" -a -z "$MOZ_PGO"; 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