Bug 986234 - Port config.status changes made by bug 979118, r=jcranmer,a=Standard8 CLOSED TREE
☠☠ backed out by fcfdcf41a2c5 ☠ ☠
authorPatrick Cloke <clokep@gmail.com>
Thu, 20 Mar 2014 21:50:23 -0400
changeset 19703 1595b413f8cc233b821e0d2510826095677cf87c
parent 19702 ca498fc736fcba5861e3ac503797b3baf7de77aa
child 19704 fcfdcf41a2c5350b824accab6a1f1db5a1fbeb9c
push id1134
push usermbanner@mozilla.com
push dateMon, 28 Apr 2014 20:03:53 +0000
treeherdercomm-beta@1595b413f8cc [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjcranmer, Standard8
bugs986234, 979118
Bug 986234 - Port config.status changes made by bug 979118, r=jcranmer,a=Standard8 CLOSED TREE
configure.in
--- a/configure.in
+++ b/configure.in
@@ -198,17 +198,17 @@ mozbuildcfg = BuildConfig.from_config_st
 
 dnl No need to tweak these from mozilla-central
 defines = mozbuildcfg.defines
 non_global_defines = mozbuildcfg.non_global_defines
 
 dnl Fix up substitutitons
 def remap_subst(pair):
     name, value = pair
-    if isinstance(value, set):
+    if isinstance(value, set) or isinstance(value, list):
         return name, value
     value = value.replace('\$(DEPTH)', '\$(DEPTH)/mozilla')
     value = value.replace('\$(topsrcdir)', '\$(topsrcdir)/mozilla')
     if name == 'ac_configure_args':
         value = r''' $ac_configure_args '''[1:-1]
     elif name in ['MOZ_BRANDING_DIRECTORY', 'MOZ_BUILD_APP']:
         value = value[3:] # Strip off ../ from the beginning
     elif name in ['top_srcdir', 'MOZ_BUILD_ROOT', 'WIN_TOP_SRC']: