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.
This commit is contained in:
Mike Hommey 2015-12-02 10:34:23 +09:00
parent 765425023d
commit 1c02cef0d5

View File

@ -12,7 +12,7 @@ $(python2.7 -c 'import json; p = json.loads(open("'"$topsrcdir"'/../buildprops.j
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