Bug 1520340 - Move old_configure_assignments formatting to prepare_configure. r=froydnj
authorMike Hommey <mh+mozilla@glandium.org>
Wed, 16 Jan 2019 23:06:41 +0000
changeset 514162 191f54a3dd6c24ec9025ed771112ef3226dc87de
parent 514161 7695daf6bc2da8616269282f55b4bf88b2a8abc3
child 514163 dd78d3f82b497c212e0274b1fdaf8b4098b5f170
push id1953
push userffxbld-merge
push dateMon, 11 Mar 2019 12:10:20 +0000
treeherdermozilla-release@9c35dcbaa899 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersfroydnj
bugs1520340
milestone66.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 1520340 - Move old_configure_assignments formatting to prepare_configure. r=froydnj Depends on D16619 Differential Revision: https://phabricator.services.mozilla.com/D16620
build/moz.configure/old.configure
build/moz.configure/util.configure
--- a/build/moz.configure/old.configure
+++ b/build/moz.configure/old.configure
@@ -142,18 +142,18 @@ def prepare_configure(old_configure, moz
                     inject("unset %s # from %s" % (key, t))
 
             inject('# end of mozconfig values')
 
         # Autoconf is special, because it might be passed from
         # mozconfig['make_extra'], which we don't pass automatically above.
         inject('export AUTOCONF=%s' % quote(autoconf))
 
-        for assignment in old_configure_assignments:
-            inject(assignment)
+        for k, v in old_configure_assignments:
+            inject('%s=%s' % (k, quote(v)))
 
     return cmd
 
 
 @template
 def old_configure_options(*options):
     for opt in options:
         option(opt, nargs='*', help='Help missing for old configure options')
--- a/build/moz.configure/util.configure
+++ b/build/moz.configure/util.configure
@@ -481,23 +481,23 @@ def add_old_configure_assignment(var, va
     value = dependable(value)
 
     @depends(old_configure_assignments, var, value, when=when)
     @imports(_from='mozbuild.shellutil', _import='quote')
     def add_assignment(assignments, var, value):
         if var is None or value is None:
             return
         if value is True:
-            assignments.append('%s=1' % var)
+            assignments.append((var, '1'))
         elif value is False:
-            assignments.append('%s=' % var)
+            assignments.append((var, ''))
         else:
             if isinstance(value, (list, tuple)):
                 value = quote(*value)
-            assignments.append('%s=%s' % (var, quote(str(value))))
+            assignments.append((var, str(value)))
 
 
 @template
 def add_old_configure_arg(arg):
     @depends(extra_old_configure_args, arg)
     def add_arg(args, arg):
         if arg:
             args.append(arg)