diff options
Diffstat (limited to 'deps/v8/tools/mb/mb.py')
| -rwxr-xr-x | deps/v8/tools/mb/mb.py | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/deps/v8/tools/mb/mb.py b/deps/v8/tools/mb/mb.py index 536dc00fcb..b37c9dde7d 100755 --- a/deps/v8/tools/mb/mb.py +++ b/deps/v8/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. + 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. @@ -1008,7 +1014,6 @@ class MetaBuildWrapper(object): + logdog_command + test_cmdline) elif use_x11 and test_type == 'windowed_test_launcher': extra_files = [ - 'xdisplaycheck', '../../testing/test_env.py', '../../testing/xvfb.py', ] |