From 293b921314794ec045de25865aecf36cdf2c1f23 Mon Sep 17 00:00:00 2001 From: Gregory Szorc Date: Thu, 9 Nov 2017 22:23:14 -0800 Subject: [PATCH] Bug 1416052 - Move export of FOUND_MOZCONFIG to Python; r=nalexander 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 --- client.mk | 2 -- python/mozbuild/mozbuild/controller/building.py | 1 + 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/client.mk b/client.mk index 49caf9b8be90d..85a4693d336dc 100644 --- a/client.mk +++ b/client.mk @@ -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 diff --git a/python/mozbuild/mozbuild/controller/building.py b/python/mozbuild/mozbuild/controller/building.py index 579f6413bac7e..4a880a1a6fe9f 100644 --- a/python/mozbuild/mozbuild/controller/building.py +++ b/python/mozbuild/mozbuild/controller/building.py @@ -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)