Bug 1416052 - Move config.guess logic to Python; r=nalexander
authorGregory Szorc <gps@mozilla.com>
Thu, 09 Nov 2017 16:17:35 -0800
changeset 391810 ee45241c58eb84dbc37c6a2ecb37187876e922d7
parent 391809 a88781c8655a63e602b46db80d0ff141f8cab9b4
child 391811 4a26fbabb7d8d8080c1280f46e6eb7793fa134e3
push id32904
push usernerli@mozilla.com
push dateWed, 15 Nov 2017 09:56:19 +0000
treeherdermozilla-central@0b135d7d8cef [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersnalexander
bugs1416052
milestone59.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
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
client.mk
python/mozbuild/mozbuild/controller/building.py
--- 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,