Commit 5005a62f authored by Michael Achenbach's avatar Michael Achenbach Committed by Commit Bot

[build] Deprecate windows toolchain support with GYP

Bug: chromium:645094
Change-Id: I04a7f6a4073a6a5c81546863d6f1f371fc74e65d
Reviewed-on: https://chromium-review.googlesource.com/691836
Commit-Queue: Michael Achenbach <machenbach@chromium.org>
Reviewed-by: 's avatarSergiy Byelozyorov <sergiyb@chromium.org>
Cr-Commit-Position: refs/heads/master@{#48226}
parent 24714efa
......@@ -10,7 +10,6 @@ make sure settings are consistent between them, all setup should happen here.
import os
import sys
import vs_toolchain
SCRIPT_DIR = os.path.dirname(os.path.realpath(__file__))
V8_ROOT = os.path.abspath(os.path.join(SCRIPT_DIR, os.pardir))
......@@ -56,5 +55,3 @@ def set_environment():
if not os.environ.get('GYP_GENERATORS'):
# Default to ninja on all platforms.
os.environ['GYP_GENERATORS'] = 'ninja'
vs_toolchain.SetEnvironmentAndGetRuntimeDllDirs()
......@@ -38,7 +38,6 @@ import platform
import shlex
import subprocess
import sys
import vs_toolchain
script_dir = os.path.dirname(os.path.realpath(__file__))
v8_root = os.path.abspath(os.path.join(script_dir, os.pardir))
......@@ -101,16 +100,7 @@ def additional_include_files(args=[]):
def run_gyp(args):
rc = gyp.main(args)
vs2013_runtime_dll_dirs = vs_toolchain.SetEnvironmentAndGetRuntimeDllDirs()
if vs2013_runtime_dll_dirs:
x64_runtime, x86_runtime = vs2013_runtime_dll_dirs
vs_toolchain.CopyVsRuntimeDlls(
os.path.join(v8_root, GetOutputDirectory()),
(x86_runtime, x64_runtime))
if rc != 0:
if gyp.main(args) != 0:
print 'Error running GYP'
sys.exit(rc)
......
This diff is collapsed.
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