diff options
author | brucedawson <brucedawson@chromium.org> | 2016-02-08 22:34:55 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2016-02-09 06:35:51 +0000 |
commit | 36f03f2ac1f92b6f41129f013f8a808f7b9127fc (patch) | |
tree | 30b50ea0b38e578297bc16e91bc9691fe44b40ea /build/toolchain/win | |
parent | 25634af9690a239e3f51b683eb2e303aae4d8136 (diff) | |
download | chromium_src-36f03f2ac1f92b6f41129f013f8a808f7b9127fc.zip chromium_src-36f03f2ac1f92b6f41129f013f8a808f7b9127fc.tar.gz chromium_src-36f03f2ac1f92b6f41129f013f8a808f7b9127fc.tar.bz2 |
Reland of Change default Windows compiler to VS 2015 (patchset #1 id:1 of https://codereview.chromium.org/1680533004/ )
Reason for revert:
The GPU bot problem (a bug with swarming tests on component builds) is fixed with crrev.com/1676943002
Original issue's description:
> Revert of Change default Windows compiler to VS 2015 (patchset #1 id:1 of https://codereview.chromium.org/1679693002/ )
>
> Reason for revert:
> This breaks GPU win debug bots (https://build.chromium.org/p/chromium.gpu/builders/Win7%20Debug%20%28NVIDIA%29/builds/36633 for example, every GPU test is crashing)
>
> Original issue's description:
> > Reland of Change default Windows compiler to VS 2015 (patchset #1 id:1 of https://codereview.chromium.org/1678663002/ )
> >
> > Reason for revert:
> > Issues that forced revert of VS 2015 as default compiler are believed to be fixed.
> >
> > Original issue's description:
> > > Revert of Change default Windows compiler to VS 2015 (patchset #10 id:180001 of https://codereview.chromium.org/1598493004/ )
> > >
> > > Reason for revert:
> > > Speculative for https://code.google.com/p/chromium/issues/detail?id=498544#c20 . Will reland if this doesn't help.
> > >
> > > Original issue's description:
> > > > Change default Windows compiler to VS 2015
> > > >
> > > > The change to get_landmines.py is there because modifying this file
> > > > affects analyze behavior so that all tests run. Changing the printed
> > > > message is purely a side effect.
> > > >
> > > > This change also removes some redundant INCLUDE paths. These are
> > > > unnecessary when building with VS 2015 (because it defaults to the
> > > > Windows 10 SDK) and actively harmful (they make the INCLUDE path
> > > > problematically long).
> > > >
> > > > BUG=440500,584782
> > > >
> > > > Committed: https://crrev.com/4c17ac0db59d7dbe78734950f83912ab564bd6fe
> > > > Cr-Commit-Position: refs/heads/master@{#373955}
> > >
> > > TBR=dpranke@chromium.org,scottmg@chromium.org,sebmarchand@chromium.org,brucedawson@chromium.org
> > > # Skipping CQ checks because original CL landed less than 1 days ago.
> > > NOPRESUBMIT=true
> > > NOTREECHECKS=true
> > > NOTRY=true
> > > BUG=440500,584782
> > >
> > > Committed: https://crrev.com/bbc766aef1bd8cb0d9546fec9abf264e7d8c1d96
> > > Cr-Commit-Position: refs/heads/master@{#374013}
> >
> > TBR=dpranke@chromium.org,scottmg@chromium.org,sebmarchand@chromium.org,thakis@chromium.org
> > # Not skipping CQ checks because original CL landed more than 1 days ago.
> > BUG=440500,584782
> >
> > Committed: https://crrev.com/20e99ecb08da22582d435c1a5bba0a5c96345da3
> > Cr-Commit-Position: refs/heads/master@{#374058}
>
> TBR=dpranke@chromium.org,scottmg@chromium.org,sebmarchand@chromium.org,thakis@chromium.org,brucedawson@chromium.org
> # Skipping CQ checks because original CL landed less than 1 days ago.
> NOPRESUBMIT=true
> NOTREECHECKS=true
> NOTRY=true
> BUG=440500,584782
>
> Committed: https://crrev.com/03f6b0af0a3a0127f5e939095157079659ab7cc8
> Cr-Commit-Position: refs/heads/master@{#374062}
TBR=dpranke@chromium.org,scottmg@chromium.org,sebmarchand@chromium.org,thakis@chromium.org,zmo@chromium.org
# Not skipping CQ checks because original CL landed more than 1 days ago.
BUG=440500,584782
Review URL: https://codereview.chromium.org/1676263003
Cr-Commit-Position: refs/heads/master@{#374324}
Diffstat (limited to 'build/toolchain/win')
-rw-r--r-- | build/toolchain/win/setup_toolchain.py | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/build/toolchain/win/setup_toolchain.py b/build/toolchain/win/setup_toolchain.py index dcb09bb..03478e6 100644 --- a/build/toolchain/win/setup_toolchain.py +++ b/build/toolchain/win/setup_toolchain.py @@ -150,18 +150,16 @@ def main(): vc_bin_dir = os.path.realpath(path) break - # The Windows SDK include directories must be first. They both have a sal.h, - # and the SDK one is newer and the SDK uses some newer features from it not - # present in the Visual Studio one. - # Having the Windows SDK first is also the only way to control which SDK - # version is used. - - if win_sdk_path: - additional_includes = ('{sdk_dir}\\Include\\10.0.10586.0\\shared;' + - '{sdk_dir}\\Include\\10.0.10586.0\\um;' + - '{sdk_dir}\\Include\\10.0.10586.0\\winrt;').format( - sdk_dir=win_sdk_path) - env['INCLUDE'] = additional_includes + env['INCLUDE'] + # Add extra include directories here that need to be in front of the + # installed and packaged include directories. This may be needed in + # order to force a particular SDK version, such as to get VS 2013 to use + # the Windows 10 SDK. Beware of making the INCLUDE variable excessively + # long and be sure to make corresponding changes to build\common.gypi. + # Not currently used. + #if win_sdk_path: + # additional_includes = ('{sdk_dir}\\Include\\10.0.10586.0\\um;').format( + # sdk_dir=win_sdk_path) + # env['INCLUDE'] = additional_includes + env['INCLUDE'] env_block = _FormatAsEnvironmentBlock(env) with open('environment.' + cpu, 'wb') as f: f.write(env_block) |