Chromium Code Reviews| Index: tools/mb/mb.py |
| diff --git a/tools/mb/mb.py b/tools/mb/mb.py |
| index 536dc00fcb16c4148a9f7a0384b55c1b8fc0a850..d213616911cab2cb8adc1f876c39dde45872ce8d 100755 |
| --- a/tools/mb/mb.py |
| +++ b/tools/mb/mb.py |
| @@ -777,7 +777,13 @@ class MetaBuildWrapper(object): |
| self.WriteFile(gn_runtime_deps_path, '\n'.join(gn_labels) + '\n') |
| cmd.append('--runtime-deps-list-file=%s' % gn_runtime_deps_path) |
| - ret, _, _ = self.Run(cmd) |
| + # Override msvs infra environment variables. |
| + # TODO(machenbach): Remove after GYP_MSVS_VERSION is removed on infra side. |
|
Michael Achenbach
2016/11/30 19:23:19
As soon as this sticks, I'll remove the GYP_MSVS_V
|
| + env = {} |
| + env.update(os.environ) |
| + env['GYP_MSVS_VERSION'] = '2015' |
| + |
| + ret, _, _ = self.Run(cmd, env=env) |
| if ret: |
| # If `gn gen` failed, we should exit early rather than trying to |
| # generate isolates. Run() will have already logged any error output. |