Bug 1006956 - Disable sccache on non-try PGO builds. r=mshal

build/mozconfig.cache

@@ -25,10 +25,14 @@ if test -z "$SCCACHE_DISABLE" -a -z "$no_sccache"; then
         bucket=mozilla-releng-s3-cache-us-west-2-try
         ;;
     b2g-inbound_*use1.mozilla.com*)
-        bucket=mozilla-releng-s3-cache-us-east-1-prod
+        if test -z "$MOZ_PGO"; then
+            bucket=mozilla-releng-s3-cache-us-east-1-prod
+        fi
         ;;
     b2g-inbound_*usw2.mozilla.com*)
-        bucket=mozilla-releng-s3-cache-us-west-2-prod
+        if test -z "$MOZ_PGO"; then
+            bucket=mozilla-releng-s3-cache-us-west-2-prod
+        fi
         ;;
     esac
 fi

client.mk

@@ -111,7 +111,8 @@ endef
 # before evaluation. $(shell) replacing newlines with spaces, || is always
 # followed by a space (since sed doesn't remove newlines), except on the
 # last line, so replace both '|| ' and '||'.
-MOZCONFIG_CONTENT := $(subst ||,$(CR),$(subst || ,$(CR),$(shell $(TOPSRCDIR)/$(MOZCONFIG_LOADER) $(TOPSRCDIR) | sed 's/$$/||/')))
+# Also, make MOZ_PGO available to mozconfig when passed on make command line.
+MOZCONFIG_CONTENT := $(subst ||,$(CR),$(subst || ,$(CR),$(shell MOZ_PGO=$(MOZ_PGO) $(TOPSRCDIR)/$(MOZCONFIG_LOADER) $(TOPSRCDIR) | sed 's/$$/||/')))
 $(eval $(MOZCONFIG_CONTENT))
 
 export FOUND_MOZCONFIG