Bug 1229613 - Properly disable sccache on PGO builds. r=mshal
authorMike Hommey <mh+mozilla@glandium.org>
Wed, 02 Dec 2015 10:34:23 +0900
changeset 309533 93f0e6c2b2fdbe74bf955d0c8f71d73daabb537f
parent 309532 917c97129ea879c0e79a93d8d97d421d79ceb210
child 309534 227d365adddb5ef567a285aa4e93d12ba4960e87
push id5513
push userraliiev@mozilla.com
push dateMon, 25 Jan 2016 13:55:34 +0000
treeherdermozilla-beta@5ee97dd05b5c [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmshal
bugs1229613, 1181040
milestone45.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 1229613 - Properly disable sccache on PGO builds. r=mshal Sccache was enabled mechanically by the switch to EC2 Windows instances, while it is not intended to be used on PGO builds. This happened because the fix for bug 1181040 disabled sccache for PGO builds where MOZ_PGO is set through mozconfig (in which case MOZ_PGO_IS_SET is set) *while* ignoring the case where MOZ_PGO is set through the environment (in which case MOZ_PGO_IS_SET is, unconveniently, *not* set). The latter is what Windows PGO builds do.
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