Chromium Code Reviews| Index: build/gyp_chromium |
| =================================================================== |
| --- build/gyp_chromium (revision 263596) |
| +++ build/gyp_chromium (working copy) |
| @@ -10,6 +10,7 @@ |
| import glob |
| import gyp_helper |
| import os |
| +import re |
| import shlex |
| import subprocess |
| import string |
| @@ -248,7 +249,7 @@ |
| # We explicitly don't support the make gyp generator (crbug.com/348686). Be |
| # nice and fail here, rather than choking in gyp. |
| - if 'make' in os.environ.get('GYP_GENERATORS', ''): |
| + if re.search('(^|,|\\s)make($|,|\\s)', os.environ.get('GYP_GENERATORS', '')): |
|
Nico
2014/04/15 20:25:47
Use r'..\s..' instead of '..\\s..'
bungeman-chromium
2014/04/15 20:34:06
Done.
|
| print 'Error: make gyp generator not supported (check GYP_GENERATORS).' |
| sys.exit(1) |