Commit 7e4fc163 authored by Michael Achenbach's avatar Michael Achenbach Committed by Commit Bot

Revert "[build] Switch windows default compilation to MSVS 2017"

This reverts commit a0d2ffb6.

Reason for revert: Breaks CI

Original change's description:
> [build] Switch windows default compilation to MSVS 2017
> 
> Bug: v8:6857
> Change-Id: Icab007681753c6f8143147ea8b2c1b06bf325d92
> Reviewed-on: https://chromium-review.googlesource.com/686900
> Commit-Queue: Michael Achenbach <machenbach@chromium.org>
> Reviewed-by: Sergiy Byelozyorov <sergiyb@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#48196}

TBR=machenbach@chromium.org,brucedawson@chromium.org,sergiyb@chromium.org

Change-Id: I5c961c8c28c6213014cf61ad342984193a18498e
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: v8:6857
Reviewed-on: https://chromium-review.googlesource.com/690034Reviewed-by: 's avatarMichael Achenbach <machenbach@chromium.org>
Commit-Queue: Michael Achenbach <machenbach@chromium.org>
Cr-Commit-Position: refs/heads/master@{#48199}
parent ac475636
......@@ -178,7 +178,7 @@ template("v8_isolate_run") {
if (is_win) {
args += [
"--config-variable",
"msvs_version=2017",
"msvs_version=2015",
]
} else {
args += [
......
......@@ -25,8 +25,8 @@
],
},
}],
# VS2015/2017 runtimes
['OS=="win" and (msvs_version==2015 or msvs_version==2017) and component=="shared_library" and (CONFIGURATION_NAME=="Debug" or CONFIGURATION_NAME=="Debug_x64")', {
# VS2015 runtimes
['OS=="win" and msvs_version==2015 and component=="shared_library" and (CONFIGURATION_NAME=="Debug" or CONFIGURATION_NAME=="Debug_x64")', {
'variables': {
'files': [
'<(PRODUCT_DIR)/msvcp140d.dll',
......@@ -36,7 +36,7 @@
],
},
}],
['OS=="win" and (msvs_version==2015 or msvs_version==2017) and component=="shared_library" and (CONFIGURATION_NAME=="Release" or CONFIGURATION_NAME=="Release_x64")', {
['OS=="win" and msvs_version==2015 and component=="shared_library" and (CONFIGURATION_NAME=="Release" or CONFIGURATION_NAME=="Release_x64")', {
'variables': {
'files': [
'<(PRODUCT_DIR)/msvcp140.dll',
......@@ -46,7 +46,7 @@
],
},
}],
['OS=="win" and (msvs_version==2015 or msvs_version==2017) and component=="shared_library"', {
['OS=="win" and msvs_version==2015 and component=="shared_library"', {
# Windows 10 Universal C Runtime binaries.
'variables': {
'files': [
......
......@@ -36,10 +36,6 @@
# Irregexp interpreter overflows stack. We should just not crash.
'fast/js/regexp-stack-overflow': [PASS, FAIL],
}], # ALWAYS
['system == windows', {
# Exceeds call stack on windows after MSVS2017 switch.
'fast/js/excessive-comma-usage': [SKIP],
}], # system == windows
['mode == debug', {
# Too slow in debug mode.
'dfg-int-overflow-in-loop': [SKIP],
......
......@@ -781,7 +781,7 @@ class MetaBuildWrapper(object):
# TODO(machenbach): Remove after GYP_MSVS_VERSION is removed on infra side.
env = {}
env.update(os.environ)
env['GYP_MSVS_VERSION'] = '2017'
env['GYP_MSVS_VERSION'] = '2015'
ret, _, _ = self.Run(cmd, env=env)
if ret:
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment