Backed out changeset e984459f2b0f (bug 1298740) for windows build failures a=backout
authorWes Kocher <wkocher@mozilla.com>
Fri, 14 Oct 2016 13:08:42 -0700
changeset 318131 bb4cb6a2db958cc42758bafd7eca92ac3eb2e3e4
parent 318130 acee3d0166dc3426e858930f9a3587122638446d
child 318132 77054c32f5dfb00945a85ea175af677a918c2120
push id33211
push usercbook@mozilla.com
push dateMon, 17 Oct 2016 09:38:38 +0000
treeherderautoland@e4ef6fa03aa8 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbackout
bugs1298740
milestone52.0a1
backs oute984459f2b0f99c9b366ca6570e13fd43339cdd8
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
Backed out changeset e984459f2b0f (bug 1298740) for windows build failures a=backout
build/moz.configure/init.configure
--- a/build/moz.configure/init.configure
+++ b/build/moz.configure/init.configure
@@ -255,17 +255,16 @@ def early_options():
         )
     return early_options
 
 early_options = early_options()
 
 @depends(mozconfig, '--help')
 # This gives access to the sandbox. Don't copy this blindly.
 @imports('__sandbox__')
-@imports('os')
 def mozconfig_options(mozconfig, help):
     if mozconfig['path']:
         helper = __sandbox__._helper
         log.info('Adding configure options from %s' % mozconfig['path'])
         for arg in mozconfig['configure_args']:
             log.info('  %s' % arg)
             # We could be using imply_option() here, but it has other
             # contraints that don't really apply to the command-line
@@ -275,20 +274,18 @@ def mozconfig_options(mozconfig, help):
         def add(key, value):
             if key.isupper():
                 arg = '%s=%s' % (key, value)
                 log.info('  %s' % arg)
                 helper.add(arg, origin='mozconfig', args=helper._args)
 
         for key, value in mozconfig['env']['added'].iteritems():
             add(key, value)
-            os.environ[key] = value
         for key, (_, value) in mozconfig['env']['modified'].iteritems():
             add(key, value)
-            os.environ[key] = value
         for key, value in mozconfig['vars']['added'].iteritems():
             # mozconfig_loader adds _IS_SET variables that are irrelevant
             if not key.endswith('_IS_SET'):
                 add(key, value)
         for key, (_, value) in mozconfig['vars']['modified'].iteritems():
             add(key, value)