Bug 1417684 - Stop writing FOUND_MOZCONFIG variable; r?build
The last consumer of FOUND_MOZCONFIG was removed in 41492b2ba4e1
(
bug 1417264). client.mk only takes the content of mozconfig.json
into account (which is derived from the content of the mozconfig
file) for dependency checking. So it should be safe to stop
writing this to .mozconfig.mk.
MozReview-Commit-ID: 2bBUvaaiWsz
--- a/python/mozbuild/mozbuild/controller/building.py
+++ b/python/mozbuild/mozbuild/controller/building.py
@@ -1344,21 +1344,16 @@ class BuildDriver(MozbuildObject):
if mozconfig['make_flags']:
mozconfig_make_lines.append(b'MOZ_MAKE_FLAGS=%s' %
b' '.join(mozconfig['make_flags']))
objdir = mozpath.normsep(self.topobjdir)
mozconfig_make_lines.append(b'MOZ_OBJDIR=%s' % objdir)
mozconfig_make_lines.append(b'OBJDIR=%s' % objdir)
- if mozconfig['path']:
- mozconfig_make_lines.append(b'FOUND_MOZCONFIG=%s' %
- mozpath.normsep(mozconfig['path']))
- mozconfig_make_lines.append(b'export FOUND_MOZCONFIG')
-
# The .mozconfig.mk file only contains exported variables and lines with
# UPLOAD_EXTRA_FILES.
mozconfig_filtered_lines = [
line for line in mozconfig_make_lines
# Bug 1418122 investigate why UPLOAD_EXTRA_FILES is special and
# remove it.
if line.startswith(b'export ') or b'UPLOAD_EXTRA_FILES' in line
]