From 49eb5aeb4cffb1e1e02e4266f941562cd382f860 Mon Sep 17 00:00:00 2001
|
From: Mike Hommey <mh+mozilla@glandium.org>
|
Date: Thu, 20 Jun 2019 18:43:25 +0000
|
Subject: [PATCH] Bug 1560340 - Only add confvars.sh as a dependency to
|
config.status when it exists. r=chmanchester
|
|
Differential Revision: https://phabricator.services.mozilla.com/D35447
|
|
---
|
moz.configure | 12 +++++++-----
|
1 file changed, 7 insertions(+), 5 deletions(-)
|
|
diff --git a/moz.configure b/moz.configure
|
index 2484ad5536..8cbc4f28a3 100755
|
--- a/moz.configure
|
+++ b/moz.configure
|
@@ -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'),
|
