From 2070a1bc41a500a9ce423b7e1a7efd1db762f3a2 Mon Sep 17 00:00:00 2001 From: Marshall Greenblatt Date: Fri, 5 Aug 2016 13:24:27 +0300 Subject: [PATCH] Windows: Add VS2015 Update 3 build support --- patch/patch.cfg | 3 +++ patch/patches/gn_config.patch | 8 +++++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/patch/patch.cfg b/patch/patch.cfg index 049b6e814..4902da56a 100644 --- a/patch/patch.cfg +++ b/patch/patch.cfg @@ -19,6 +19,9 @@ patches = [ # # Support custom VS toolchain on Windows. # https://bugs.chromium.org/p/chromium/issues/detail?id=623342 + # + # Write environment.* files with the correct SDK version on Windows. + # https://bugs.chromium.org/p/chromium/issues/detail?id=634788 'name': 'gn_config', 'path': '../', }, diff --git a/patch/patches/gn_config.patch b/patch/patches/gn_config.patch index c88e27412..3d711b8d8 100644 --- a/patch/patches/gn_config.patch +++ b/patch/patches/gn_config.patch @@ -56,10 +56,11 @@ index 5bfa9a7..5e6e05d 100644 + "studio path") } diff --git build/toolchain/win/setup_toolchain.py build/toolchain/win/setup_toolchain.py -index d58cb85..fd608ba 100644 +diff --git build/toolchain/win/setup_toolchain.py build/toolchain/win/setup_toolchain.py +index d58cb85..c7384b9 100644 --- build/toolchain/win/setup_toolchain.py +++ build/toolchain/win/setup_toolchain.py -@@ -124,11 +124,14 @@ def _LoadToolchainEnv(cpu, sdk_dir): +@@ -124,11 +124,15 @@ def _LoadToolchainEnv(cpu, sdk_dir): script_path = os.path.normpath(os.path.join( os.environ['GYP_MSVS_OVERRIDE_PATH'], 'VC/vcvarsall.bat')) @@ -69,7 +70,8 @@ index d58cb85..fd608ba 100644 - args = [script_path, 'amd64_x86' if cpu == 'x86' else 'amd64'] - variables = _LoadEnvFromBat(args) + if os.path.exists(script_path): -+ args = [script_path, 'amd64_x86' if cpu == 'x86' else 'amd64'] ++ args = [script_path, 'amd64_x86' if cpu == 'x86' else 'amd64', \ ++ '10.0.10586.0'] + variables = _LoadEnvFromBat(args) + else: + variables = []