Bug 1574115 Follow up: Fix path to sccache executable. rs=bustage-fix
authorRob Lemley <rob@thunderbird.net>
Fri, 16 Aug 2019 01:14:10 -0400
changeset 27332 2f2113a4e5e4fe6a59eb04296e0a678529a1dc51
parent 27331 91539be83495f83daab9b943d0c238c7fa4d8b49
child 27333 a117aceeecb22da9f2d0b27f8a53b93ffecee817
push id16288
push userthunderbird@calypsoblue.org
push dateFri, 16 Aug 2019 05:47:35 +0000
treeherdercomm-central@a117aceeecb2 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbustage-fix
bugs1574115
Bug 1574115 Follow up: Fix path to sccache executable. rs=bustage-fix
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/sccache/sccache${suffix}"
+    export CCACHE="$MOZ_FETCHES_DIR/sccache/sccache${suffix}"
     export SCCACHE_VERBOSE_STATS=1
-    mk_add_options "MOZBUILD_MANAGE_SCCACHE_DAEMON=${topsrcdir}/sccache/sccache"
+    mk_add_options "MOZBUILD_MANAGE_SCCACHE_DAEMON=$MOZ_FETCHES_DIR/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