diff options
| author | bors-servo <lbergstrom+bors@mozilla.com> | 2019-09-12 16:57:18 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-12 16:57:18 -0400 |
| commit | e6376ab322b7c4dafb6605949bd3b5a77525df35 (patch) | |
| tree | ae2af7b01795e270b3d35d61de056b41100fe8cd /python/servo/build_commands.py | |
| parent | 89d0b0233a230274c93cfc514525e29e2d691a7e (diff) | |
| parent | 3f025f889c553780d050401b38489494b1ae07e3 (diff) | |
| download | servo-e6376ab322b7c4dafb6605949bd3b5a77525df35.tar.gz servo-e6376ab322b7c4dafb6605949bd3b5a77525df35.zip | |
Auto merge of #24197 - Manishearth:vs-crt, r=jdm
Pull in CRT runtime on VS 2019 as well
Building for x64 UWP leads to the build system complaining about this DLL not being in the target/ folder.
I think these three VS versions are the only ones we support, perhaps we should remove this check entirely and unconditionally include this DLL?
r? @jdm
<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/24197)
<!-- Reviewable:end -->
Diffstat (limited to 'python/servo/build_commands.py')
| -rw-r--r-- | python/servo/build_commands.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/python/servo/build_commands.py b/python/servo/build_commands.py index 5c5cacdc48f..e07a7666e0e 100644 --- a/python/servo/build_commands.py +++ b/python/servo/build_commands.py @@ -951,7 +951,7 @@ def package_msvc_dlls(servo_exe_dir, target, vcinstalldir, vs_version): "msvcp140.dll", "vcruntime140.dll", ] - if target_arch != "aarch64" and vs_version in ("14.0", "15.0"): + if target_arch != "aarch64" and vs_version in ("14.0", "15.0", "16.0"): msvc_deps += ["api-ms-win-crt-runtime-l1-1-0.dll"] # Check if it's Visual C++ Build Tools or Visual Studio 2015 |