From 0928fbaff81fc6e9aefc10d376a0c38a9d8fd185 Mon Sep 17 00:00:00 2001 From: "brucedawson@chromium.org" Date: Thu, 21 Jan 2016 01:30:24 +0000 Subject: [PATCH] Skip include\ucrt on VS 2013 packages In change crrev.com/1504983002 the include\ucrt path from the Windows 10 SDK was added to the include search path, but this is not a legal thing to do on VS 2013. This change makes the ucrt path VS 2015 specific. Testing shows that this makes no difference to the VS 2015 package. BUG=440500 Review URL: https://codereview.chromium.org/1609933004 git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@298330 0039d316-1c4b-4281-b951-d872f2087c98 --- win_toolchain/package_from_installed.py | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/win_toolchain/package_from_installed.py b/win_toolchain/package_from_installed.py index a178864a1..c71de3dab 100644 --- a/win_toolchain/package_from_installed.py +++ b/win_toolchain/package_from_installed.py @@ -187,12 +187,14 @@ def GenerateSetEnvCmd(target_dir): 'set VCINSTALLDIR=%~dp0..\\..\\VC\\\n' 'set PATH=%~dp0..\\..\\Common7\\IDE;%PATH%\n' 'set INCLUDE=%~dp0..\\..\\win_sdk\\Include\\WINVERSION\\um;' - '%~dp0..\\..\\win_sdk\\Include\\WINVERSION\\shared;' - '%~dp0..\\..\\win_sdk\\Include\\WINVERSION\\winrt;' - '%~dp0..\\..\\win_sdk\\Include\\WINVERSION\\ucrt;' # VS 2015 - '%~dp0..\\..\\VC\\include;' - '%~dp0..\\..\\VC\\atlmfc\\include\n' - 'if "%1"=="/x64" goto x64\n'.replace('WINVERSION', WIN_VERSION)) + '%~dp0..\\..\\win_sdk\\Include\\WINVERSION\\shared;' + '%~dp0..\\..\\win_sdk\\Include\\WINVERSION\\winrt;'.replace( + 'WINVERSION', WIN_VERSION)) + if VS_VERSION == '2015': + f.write('%~dp0..\\..\\win_sdk\\Include\\WINVERSION\\ucrt;'.replace( + 'WINVERSION', WIN_VERSION)) + f.write('%~dp0..\\..\\VC\\include;' + '%~dp0..\\..\\VC\\atlmfc\\include\n') # x86. Always use amd64_x86 cross, not x86 on x86. f.write('set PATH=%~dp0..\\..\\win_sdk\\bin\\x86;'