Skip to content

Commit

Permalink
Bug 1416052 - Move export of FOUND_MOZCONFIG to Python; r=nalexander
Browse files Browse the repository at this point in the history
This should have the same net result.

TBH, I'm not 100% convinced we need this export. It is only needed
to send variables to sub-makes. And the only make file reading
FOUND_MOZCONFIG is client.mk. Since the code that evals the
auto-generated make file is always executed in client.mk, we
shouldn't need this export.

All this code is going away soon anyway. So I'm inclined to cargo
cult this just in case.

MozReview-Commit-ID: DqF1BU702A
  • Loading branch information
indygreg committed Nov 10, 2017
1 parent 32761f1 commit 293b921
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 2 deletions.
2 changes: 0 additions & 2 deletions client.mk
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,6 @@ endef
MOZCONFIG_CONTENT := $(subst ||,$(CR),$(subst || ,$(CR),$(shell cat $(OBJDIR)/.mozconfig-client-mk | sed 's/$$/||/')))
include $(OBJDIR)/.mozconfig-client-mk

export FOUND_MOZCONFIG

# As '||' was used as a newline separator, it means it's not occurring in
# lines themselves. It can thus safely be used to replaces normal spaces,
# to then replace newlines with normal spaces. This allows to get a list
Expand Down
1 change: 1 addition & 0 deletions python/mozbuild/mozbuild/controller/building.py
Original file line number Diff line number Diff line change
Expand Up @@ -1339,6 +1339,7 @@ def _run_client_mk(self, target=None, line_handler=None, jobs=0,
if mozconfig['path']:
fh.write(b'FOUND_MOZCONFIG=%s\n' %
mozpath.normsep(mozconfig['path']))
fh.write(b'export FOUND_MOZCONFIG\n')

append_env['OBJDIR'] = mozpath.normsep(self.topobjdir)

Expand Down

0 comments on commit 293b921

Please sign in to comment.