Skip to content
This repository has been archived by the owner on Aug 4, 2022. It is now read-only.

Commit

Permalink
Bug 1560340 - Only add confvars.sh as a dependency to config.status w…
Browse files Browse the repository at this point in the history
…hen it exists. r=chmanchester

Differential Revision: https://phabricator.services.mozilla.com/D35447
  • Loading branch information
glandium committed Jun 20, 2019
1 parent 1fddc09 commit 17b881e
Showing 1 changed file with 7 additions and 5 deletions.
12 changes: 7 additions & 5 deletions moz.configure
Original file line number Diff line number Diff line change
Expand Up @@ -640,20 +640,22 @@ include('js/sub.configure', when=compile_environment & toolkit)
@depends(check_build_environment, build_project)
@imports('__sandbox__')
@imports('glob')
@imports(_from='os.path', _import='exists')
def config_status_deps(build_env, build_project):

topsrcdir = build_env.topsrcdir
topobjdir = build_env.topobjdir

if not build_env.topobjdir.endswith('js/src'):
extra_deps = [
os.path.join(topsrcdir, build_project, 'confvars.sh'),
os.path.join(topobjdir, '.mozconfig.json'),
]
if not topobjdir.endswith('js/src'):
extra_deps = [os.path.join(topobjdir, '.mozconfig.json')]
else:
# mozconfig changes may impact js configure.
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 + [
os.path.join(topsrcdir, 'CLOBBER'),
os.path.join(topsrcdir, 'configure'),
Expand Down

0 comments on commit 17b881e

Please sign in to comment.