Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-29 07:42:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1416490 - Ensure environment variables that are configure options are passed from configure to old-configure. r=glandium

Browse Source 
MozReview-Commit-ID: GFP8bahu1bb

--HG--
extra : rebase_source : 1ff35a8b6470308b71dc74c2befb8219a41534c2
This commit is contained in:
Chris Manchester 2017-11-13 23:33:35 -08:00
parent 2473770fb6
commit 8055730c30
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
build/moz.configure/old.configure
View File

@ -306,6 +306,7 @@ def old_configure_options(*options):
@imports('sys')
@imports(_from='mozbuild.shellutil', _import='quote')
@imports(_from='mozbuild.shellutil', _import='split')
@imports(_from='mozbuild.util', _import='encode')
def old_configure(prepare_configure, extra_old_configure_args, all_options,
*options):
cmd = prepare_configure
@ -319,7 +320,7 @@ def old_configure(prepare_configure, extra_old_configure_args, all_options,
if value.origin != 'default'
]
env = os.environ
env = dict(os.environ)
extra_env = {}
# We also pass it the options from js/moz.configure so that it can pass
@ -335,7 +336,6 @@ def old_configure(prepare_configure, extra_old_configure_args, all_options,
extra_env[k] = v
if extra_env:
env = dict(env)
env.update(extra_env)
# For debugging purpose, in case it's not what we'd expect.
@ -356,7 +356,7 @@ def old_configure(prepare_configure, extra_old_configure_args, all_options,
log_size = os.path.getsize('config.log')
ret = subprocess.call(cmd)
ret = subprocess.call(cmd, env=encode(env))
if ret:
with log.queue_debug():
with encoded_open('config.log', 'r') as fh: