nagai/fune
3
0
Fork 0
forked from mirrors/gecko-dev
Code Pull requests Activity

Bug 1560340 - Only add confvars.sh as a dependency to config.status when it exists. r=chmanchester

Browse source 
Differential Revision: https://phabricator.services.mozilla.com/D35447

--HG--
extra : moz-landing-system : lando
This commit is contained in:
Mike Hommey 2019-06-20 18:43:25 +00:00
parent 0fe505a6fe
commit 1440a9cd78
1 changed files with 7 additions and 5 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

12
moz.configure
View file

@ -640,20 +640,22 @@ include('js/sub.configure', when=compile_environment & toolkit)
@depends(check_build_environment, build_project) @depends(check_build_environment, build_project)
@imports('__sandbox__') @imports('__sandbox__')
@imports('glob') @imports('glob')
@imports(_from='os.path', _import='exists')
def config_status_deps(build_env, build_project): def config_status_deps(build_env, build_project):
topsrcdir = build_env.topsrcdir topsrcdir = build_env.topsrcdir
topobjdir = build_env.topobjdir topobjdir = build_env.topobjdir
if not build_env.topobjdir.endswith('js/src'): if not topobjdir.endswith('js/src'):
extra_deps = [ extra_deps = [os.path.join(topobjdir, '.mozconfig.json')]
os.path.join(topsrcdir, build_project, 'confvars.sh'),
os.path.join(topobjdir, '.mozconfig.json'),
]
else: else:
# mozconfig changes may impact js configure. # mozconfig changes may impact js configure.
extra_deps = [os.path.join(topobjdir[:-7], '.mozconfig.json')] extra_deps = [os.path.join(topobjdir[:-7], '.mozconfig.json')]
confvars = os.path.join(topsrcdir, build_project, 'confvars.sh')
if exists(confvars):
extra_deps.append(confvars)
return list(__sandbox__._all_paths) + extra_deps + [ return list(__sandbox__._all_paths) + extra_deps + [
os.path.join(topsrcdir, 'CLOBBER'), os.path.join(topsrcdir, 'CLOBBER'),
os.path.join(topsrcdir, 'configure'), os.path.join(topsrcdir, 'configure'),