Port bug 1553339 - Abandon "2" in sccache toolchain artifacts. r=jorgk
authorRob Lemley <rob@thunderbird.net>
Thu, 23 May 2019 19:07:50 -0400
changeset 35676 03a1c48e8e694ac51f444d7e6eeb138a6f110bb7
parent 35675 2b1b73b8c5d7239ec32be81e337ec3b46e813473
child 35677 5a137395d1dbba0faf39fdb2b8e6ef4d83014fa9
push id392
push userclokep@gmail.com
push dateMon, 02 Sep 2019 20:17:19 +0000
reviewersjorgk
bugs1553339
Port bug 1553339 - Abandon "2" in sccache toolchain artifacts. r=jorgk Remove from C-C's copy of mozconfig.cache as well.
build/mozconfig.sccache
--- a/build/mozconfig.sccache
+++ b/build/mozconfig.sccache
@@ -29,19 +29,19 @@ if test -n "$bucket"; then
     *Windows)
         platform=win
 	;;
     *)
         mk_add_options "export AWS_IAM_CREDENTIALS_URL=http://taskcluster/auth/v1/aws/s3/read-write/${bucket}/?format=iam-role-compat"
 	;;
     esac
 
-    export CCACHE="$topsrcdir/sccache2/sccache${suffix}"
+    export CCACHE="$topsrcdir/sccache/sccache${suffix}"
     export SCCACHE_VERBOSE_STATS=1
-    mk_add_options "MOZBUILD_MANAGE_SCCACHE_DAEMON=${topsrcdir}/sccache2/sccache"
+    mk_add_options "MOZBUILD_MANAGE_SCCACHE_DAEMON=${topsrcdir}/sccache/sccache"
     mk_add_options "UPLOAD_EXTRA_FILES+=sccache.log.gz"
 
     case "$platform" in
     win)
         # sccache supports a special flag to create depfiles.
         #TODO: bug 1318370 - move this all into toolchain.configure
         export _DEPEND_CFLAGS='-deps$(MDDEPDIR)/$(@F).pp'
         # Windows builds have a default wrapper that needs to be overridden