Bug 1575288 - Shutdown sccache from the right place after bug 1573435. r=nalexander

Differential Revision: https://phabricator.services.mozilla.com/D42762

--HG--
extra : moz-landing-system : lando
This commit is contained in:
Mike Hommey 2019-08-21 02:52:35 +00:00
parent 1523b3dab0
commit fdb08df9ff

View File

@ -1624,7 +1624,8 @@ or run without that action (ie: --no-{action})"
'''If sccache was in use for this build, shut down the sccache server.''' '''If sccache was in use for this build, shut down the sccache server.'''
if os.environ.get('USE_SCCACHE') == '1': if os.environ.get('USE_SCCACHE') == '1':
topsrcdir = self.query_abs_dirs()['abs_src_dir'] topsrcdir = self.query_abs_dirs()['abs_src_dir']
sccache = os.path.join(topsrcdir, 'sccache', 'sccache') sccache_base = os.environ['MOZ_FETCHES_DIR']
sccache = os.path.join(sccache_base, 'sccache', 'sccache')
if self._is_windows(): if self._is_windows():
sccache += '.exe' sccache += '.exe'
self.run_command([sccache, '--stop-server'], cwd=topsrcdir) self.run_command([sccache, '--stop-server'], cwd=topsrcdir)