Skip to content

Commit c71fc99

Browse files
mi-acCommit bot
mi-ac
authored and
Commit bot
committed
[build] Use MSVS 2015 by default.
BUG=chromium:603131 LOG=y Committed: https://crrev.com/6b9c49cac101d1a373ae1a098b7959f8aff848ac Review-Url: https://codereview.chromium.org/2533813002 Cr-Original-Commit-Position: refs/heads/master@{#41407} Cr-Commit-Position: refs/heads/master@{#41410}
1 parent 48a522b commit c71fc99

5 files changed

Lines changed: 109 additions & 3 deletions

File tree

‎DEPS‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -263,7 +263,7 @@ hooks = [
263263
# Update the Windows toolchain if necessary.
264264
'name': 'win_toolchain',
265265
'pattern': '.',
266-
'action': ['python', 'v8/gypfiles/vs_toolchain.py', 'update'],
266+
'action': ['python', 'v8/build/vs_toolchain.py', 'update'],
267267
},
268268
# Pull binutils for linux, enabled debug fission for faster linking /
269269
# debugging when used with clang on Ubuntu Precise.

‎gni/isolate.gni‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ template("v8_isolate_run") {
180180
if (is_win) {
181181
args += [
182182
"--config-variable",
183-
"msvs_version=2013",
183+
"msvs_version=2015",
184184
]
185185
} else {
186186
args += [

‎gypfiles/win/msvs_dependencies.isolate‎

Lines changed: 97 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,97 @@
1+
# Copyright 2016 The Chromium Authors. All rights reserved.
2+
# Use of this source code is governed by a BSD-style license that can be
3+
# found in the LICENSE file.
4+
5+
# TODO(machenbach): Remove this when crbug.com/669910 is resolved.
6+
{
7+
'conditions': [
8+
# Copy the VS runtime DLLs into the isolate so that they
9+
# don't have to be preinstalled on the target machine.
10+
#
11+
# VS2013 runtimes
12+
['OS=="win" and msvs_version==2013 and component=="shared_library" and (CONFIGURATION_NAME=="Debug" or CONFIGURATION_NAME=="Debug_x64")', {
13+
'variables': {
14+
'files': [
15+
'<(PRODUCT_DIR)/msvcp120d.dll',
16+
'<(PRODUCT_DIR)/msvcr120d.dll',
17+
],
18+
},
19+
}],
20+
['OS=="win" and msvs_version==2013 and component=="shared_library" and (CONFIGURATION_NAME=="Release" or CONFIGURATION_NAME=="Release_x64")', {
21+
'variables': {
22+
'files': [
23+
'<(PRODUCT_DIR)/msvcp120.dll',
24+
'<(PRODUCT_DIR)/msvcr120.dll',
25+
],
26+
},
27+
}],
28+
# VS2015 runtimes
29+
['OS=="win" and msvs_version==2015 and component=="shared_library" and (CONFIGURATION_NAME=="Debug" or CONFIGURATION_NAME=="Debug_x64")', {
30+
'variables': {
31+
'files': [
32+
'<(PRODUCT_DIR)/msvcp140d.dll',
33+
'<(PRODUCT_DIR)/vccorlib140d.dll',
34+
'<(PRODUCT_DIR)/vcruntime140d.dll',
35+
'<(PRODUCT_DIR)/ucrtbased.dll',
36+
],
37+
},
38+
}],
39+
['OS=="win" and msvs_version==2015 and component=="shared_library" and (CONFIGURATION_NAME=="Release" or CONFIGURATION_NAME=="Release_x64")', {
40+
'variables': {
41+
'files': [
42+
'<(PRODUCT_DIR)/msvcp140.dll',
43+
'<(PRODUCT_DIR)/vccorlib140.dll',
44+
'<(PRODUCT_DIR)/vcruntime140.dll',
45+
'<(PRODUCT_DIR)/ucrtbase.dll',
46+
],
47+
},
48+
}],
49+
['OS=="win" and msvs_version==2015 and component=="shared_library"', {
50+
# Windows 10 Universal C Runtime binaries.
51+
'variables': {
52+
'files': [
53+
'<(PRODUCT_DIR)/api-ms-win-core-console-l1-1-0.dll',
54+
'<(PRODUCT_DIR)/api-ms-win-core-datetime-l1-1-0.dll',
55+
'<(PRODUCT_DIR)/api-ms-win-core-debug-l1-1-0.dll',
56+
'<(PRODUCT_DIR)/api-ms-win-core-errorhandling-l1-1-0.dll',
57+
'<(PRODUCT_DIR)/api-ms-win-core-file-l1-1-0.dll',
58+
'<(PRODUCT_DIR)/api-ms-win-core-file-l1-2-0.dll',
59+
'<(PRODUCT_DIR)/api-ms-win-core-file-l2-1-0.dll',
60+
'<(PRODUCT_DIR)/api-ms-win-core-handle-l1-1-0.dll',
61+
'<(PRODUCT_DIR)/api-ms-win-core-heap-l1-1-0.dll',
62+
'<(PRODUCT_DIR)/api-ms-win-core-interlocked-l1-1-0.dll',
63+
'<(PRODUCT_DIR)/api-ms-win-core-libraryloader-l1-1-0.dll',
64+
'<(PRODUCT_DIR)/api-ms-win-core-localization-l1-2-0.dll',
65+
'<(PRODUCT_DIR)/api-ms-win-core-memory-l1-1-0.dll',
66+
'<(PRODUCT_DIR)/api-ms-win-core-namedpipe-l1-1-0.dll',
67+
'<(PRODUCT_DIR)/api-ms-win-core-processenvironment-l1-1-0.dll',
68+
'<(PRODUCT_DIR)/api-ms-win-core-processthreads-l1-1-0.dll',
69+
'<(PRODUCT_DIR)/api-ms-win-core-processthreads-l1-1-1.dll',
70+
'<(PRODUCT_DIR)/api-ms-win-core-profile-l1-1-0.dll',
71+
'<(PRODUCT_DIR)/api-ms-win-core-rtlsupport-l1-1-0.dll',
72+
'<(PRODUCT_DIR)/api-ms-win-core-string-l1-1-0.dll',
73+
'<(PRODUCT_DIR)/api-ms-win-core-synch-l1-1-0.dll',
74+
'<(PRODUCT_DIR)/api-ms-win-core-synch-l1-2-0.dll',
75+
'<(PRODUCT_DIR)/api-ms-win-core-sysinfo-l1-1-0.dll',
76+
'<(PRODUCT_DIR)/api-ms-win-core-timezone-l1-1-0.dll',
77+
'<(PRODUCT_DIR)/api-ms-win-core-util-l1-1-0.dll',
78+
'<(PRODUCT_DIR)/api-ms-win-crt-conio-l1-1-0.dll',
79+
'<(PRODUCT_DIR)/api-ms-win-crt-convert-l1-1-0.dll',
80+
'<(PRODUCT_DIR)/api-ms-win-crt-environment-l1-1-0.dll',
81+
'<(PRODUCT_DIR)/api-ms-win-crt-filesystem-l1-1-0.dll',
82+
'<(PRODUCT_DIR)/api-ms-win-crt-heap-l1-1-0.dll',
83+
'<(PRODUCT_DIR)/api-ms-win-crt-locale-l1-1-0.dll',
84+
'<(PRODUCT_DIR)/api-ms-win-crt-math-l1-1-0.dll',
85+
'<(PRODUCT_DIR)/api-ms-win-crt-multibyte-l1-1-0.dll',
86+
'<(PRODUCT_DIR)/api-ms-win-crt-private-l1-1-0.dll',
87+
'<(PRODUCT_DIR)/api-ms-win-crt-process-l1-1-0.dll',
88+
'<(PRODUCT_DIR)/api-ms-win-crt-runtime-l1-1-0.dll',
89+
'<(PRODUCT_DIR)/api-ms-win-crt-stdio-l1-1-0.dll',
90+
'<(PRODUCT_DIR)/api-ms-win-crt-string-l1-1-0.dll',
91+
'<(PRODUCT_DIR)/api-ms-win-crt-time-l1-1-0.dll',
92+
'<(PRODUCT_DIR)/api-ms-win-crt-utility-l1-1-0.dll',
93+
],
94+
},
95+
}],
96+
],
97+
}

‎src/base.isolate‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,9 @@
44
{
55
'includes': [
66
'../third_party/icu/icu.isolate',
7+
8+
# MSVS runtime libraries.
9+
'../gypfiles/win/msvs_dependencies.isolate',
710
],
811
'conditions': [
912
['v8_use_snapshot=="true" and v8_use_external_startup_data==1', {

‎tools/mb/mb.py‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -777,7 +777,13 @@ def RunGNGen(self, vals):
777777
self.WriteFile(gn_runtime_deps_path, '\n'.join(gn_labels) + '\n')
778778
cmd.append('--runtime-deps-list-file=%s' % gn_runtime_deps_path)
779779

780-
ret, _, _ = self.Run(cmd)
780+
# Override msvs infra environment variables.
781+
# TODO(machenbach): Remove after GYP_MSVS_VERSION is removed on infra side.
782+
env = {}
783+
env.update(os.environ)
784+
env['GYP_MSVS_VERSION'] = '2015'
785+
786+
ret, _, _ = self.Run(cmd, env=env)
781787
if ret:
782788
# If `gn gen` failed, we should exit early rather than trying to
783789
# generate isolates. Run() will have already logged any error output.

0 commit comments

Comments
 (0)