Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-07 14:35:33 +01:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #24352 - servo:jdm-patch-28, r=paulrouget

Browse source 
Use correct OpenSSL arch in UWP builds.

This is a followup from #24257. I forgot to run the UWP WACK tests after making my changes, or I would have noticed that the wrong DLLs were being selected for UWP builds.

<!-- 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/24352)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2019-10-03 18:42:23 -04:00 • committed by GitHub
commit c2052437dc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
python/servo/command_base.py
View file

@ -642,7 +642,7 @@ install them, let us know by filing a bug!")
target_arch = vcpkg_arch[arch] target_arch = vcpkg_arch[arch]
if uwp: if uwp:
target_arch += "-uwp" target_arch += "-uwp"
openssl_base_dir = path.join(self.msvc_package_dir("openssl"), vcpkg_arch[arch]) openssl_base_dir = path.join(self.msvc_package_dir("openssl"), target_arch)
# Link openssl # Link openssl
env["OPENSSL_INCLUDE_DIR"] = path.join(openssl_base_dir, "include") env["OPENSSL_INCLUDE_DIR"] = path.join(openssl_base_dir, "include")