Bug 1416052 - Move config.guess logic to Python; r=nalexander
Instead of evaluating config.guess in client.mk, we evaluate it
in Python. The Python code also looks for CONFIG_GUESS in the
mozconfig. This still happens in client.mk courtesy of evaling
the mozconfig's relevant parts.
MozReview-Commit-ID: 87NmQiB2ccX
--- a/client.mk
+++ b/client.mk
@@ -29,18 +29,16 @@ endif
CWD := $(CURDIR)
ifeq "$(CWD)" "/"
CWD := /.
endif
PYTHON ?= $(shell which python2.7 > /dev/null 2>&1 && echo python2.7 || echo python)
-CONFIG_GUESS := $(shell $(TOPSRCDIR)/build/autoconf/config.guess)
-
####################################
# Load mozconfig Options
# See build pages, http://www.mozilla.org/build/ for how to set up mozconfig.
define CR
--- a/python/mozbuild/mozbuild/controller/building.py
+++ b/python/mozbuild/mozbuild/controller/building.py
@@ -1316,16 +1316,18 @@ class BuildDriver(MozbuildObject):
install_test_files(mozpath.normpath(self.topsrcdir), self.topobjdir,
'_tests', test_objs)
def _run_client_mk(self, target=None, line_handler=None, jobs=0,
verbose=None, keep_going=False, append_env=None):
append_env = dict(append_env or {})
append_env['TOPSRCDIR'] = self.topsrcdir
+ append_env['CONFIG_GUESS'] = self.resolve_config_guess()
+
return self._run_make(srcdir=True,
filename='client.mk',
allow_parallel=False,
ensure_exit_code=False,
print_directory=False,
target=target,
line_handler=line_handler,
log=False,