Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-08 02:14:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1416052 - Move config.guess logic to Python; r=nalexander

Browse Source 
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

--HG--
extra : rebase_source : 368bc7bf1375a3943ce62fbb77458c40091a7092
This commit is contained in:
Gregory Szorc 2017-11-09 16:17:35 -08:00
parent bf68f14cc2
commit 7a18a1aaf7
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client.mk
View File

@ -34,8 +34,6 @@ 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

2
python/mozbuild/mozbuild/controller/building.py
View File

@ -1321,6 +1321,8 @@ class BuildDriver(MozbuildObject):
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,