Bug 1242132 - Make sure to split multiple _FLAGS after bug 1224452. r=glandium
authorJan Beich <jbeich@FreeBSD.org>
Sun, 21 Feb 2016 21:18:03 +0000
changeset 322144 5e0cf0c0f8c3c6c46698e3f7d3181db1032d045d
parent 322143 5b20181a5b50b92259038a88202b2ece37e2b702
child 322145 67e2660b7478b55f0e230d94049f9103870c4bf5
push id5913
push userjlund@mozilla.com
push dateMon, 25 Apr 2016 16:57:49 +0000
treeherdermozilla-beta@dcaf0a6fa115 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersglandium
bugs1242132, 1224452
milestone47.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 1242132 - Make sure to split multiple _FLAGS after bug 1224452. r=glandium
python/mozbuild/mozbuild/frontend/gyp_reader.py
--- a/python/mozbuild/mozbuild/frontend/gyp_reader.py
+++ b/python/mozbuild/mozbuild/frontend/gyp_reader.py
@@ -212,17 +212,17 @@ def read_from_gyp(config, path, output, 
                     suffix_map[e]
                     for e in extensions if e in suffix_map
                 )
                 for var in variables:
                     for f in flags:
                         # We may be getting make variable references out of the
                         # gyp data, and we don't want those in emitted data, so
                         # substitute them with their actual value.
-                        f = expand_variables(f, config.substs)
+                        f = expand_variables(f, config.substs).split()
                         if not f:
                             continue
                         # the result may be a string or a list.
                         if isinstance(f, types.StringTypes):
                             context[var].append(f)
                         else:
                             context[var].extend(f)
         else: