diff options
| author | brucedawson <brucedawson@chromium.org> | 2016-02-22 15:09:18 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-02-22 23:11:01 +0000 |
| commit | c6f6c69e52a78e9feeb7f7b82283764386f5570f (patch) | |
| tree | 3d3f944f6da9d8ebf5074163e14876c104a003ea /build/vs_toolchain.py | |
| parent | 3f03d407d805c741811715735b42dc4bef6676ea (diff) | |
| download | chromium_src-c6f6c69e52a78e9feeb7f7b82283764386f5570f.zip chromium_src-c6f6c69e52a78e9feeb7f7b82283764386f5570f.tar.gz chromium_src-c6f6c69e52a78e9feeb7f7b82283764386f5570f.tar.bz2 | |
CR tweaks that missed the last CL
In crrev.com/1676943002 a couple of CR comments were made after the
commit button was checked. This applies those fixes.
BUG=440500
Review URL: https://codereview.chromium.org/1708663003
Cr-Commit-Position: refs/heads/master@{#376843}
Diffstat (limited to 'build/vs_toolchain.py')
| -rwxr-xr-x | build/vs_toolchain.py | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/build/vs_toolchain.py b/build/vs_toolchain.py index 7c5c989..7260d87 100755 --- a/build/vs_toolchain.py +++ b/build/vs_toolchain.py @@ -176,7 +176,7 @@ def _CopyRuntime2013(target_dir, source_dir, dll_pattern): _CopyRuntimeImpl(target, source) -def _CopyRuntime2015(target_dir, source_dir, dll_pattern): +def _CopyRuntime2015(target_dir, source_dir, dll_pattern, suffix): """Copy both the msvcp and vccorlib runtime DLLs, only if the target doesn't exist, but the target directory does exist.""" for file_part in ('msvcp', 'vccorlib', 'vcruntime'): @@ -184,6 +184,14 @@ def _CopyRuntime2015(target_dir, source_dir, dll_pattern): target = os.path.join(target_dir, dll) source = os.path.join(source_dir, dll) _CopyRuntimeImpl(target, source) + ucrt_src_dir = os.path.join(source_dir, 'api-ms-win-*.dll') + print 'Copying %s to %s...' % (ucrt_src_dir, target_dir) + for ucrt_src_file in glob.glob(ucrt_src_dir): + file_part = os.path.basename(ucrt_src_file) + ucrt_dst_file = os.path.join(target_dir, file_part) + _CopyRuntimeImpl(ucrt_dst_file, ucrt_src_file, False) + _CopyRuntimeImpl(os.path.join(target_dir, 'ucrtbase' + suffix), + os.path.join(source_dir, 'ucrtbase' + suffix)) def _CopyRuntime(target_dir, source_dir, target_cpu, debug): @@ -191,15 +199,7 @@ def _CopyRuntime(target_dir, source_dir, target_cpu, debug): directory does exist. Handles VS 2013 and VS 2015.""" suffix = "d.dll" if debug else ".dll" if GetVisualStudioVersion() == '2015': - _CopyRuntime2015(target_dir, source_dir, '%s140' + suffix) - ucrt_src_dir = os.path.join(source_dir, 'api-ms-win-*.dll') - print 'Copying %s to %s...' % (ucrt_src_dir, target_dir) - for ucrt_src_file in glob.glob(ucrt_src_dir): - file_part = os.path.basename(ucrt_src_file) - ucrt_dst_file = os.path.join(target_dir, file_part) - _CopyRuntimeImpl(ucrt_dst_file, ucrt_src_file, False) - _CopyRuntimeImpl(os.path.join(target_dir, 'ucrtbase' + suffix), - os.path.join(source_dir, 'ucrtbase' + suffix)) + _CopyRuntime2015(target_dir, source_dir, '%s140' + suffix, suffix) else: _CopyRuntime2013(target_dir, source_dir, 'msvc%s120' + suffix) |