diff options
| author | bors-servo <lbergstrom+bors@mozilla.com> | 2019-05-31 21:58:20 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-31 21:58:20 -0400 |
| commit | 9d9fff3b0ad843286875051e6544b3d4750d6238 (patch) | |
| tree | 62bfe68cb28b60e79f660f89ead0cec76f685120 /python/servo/command_base.py | |
| parent | e3dc86bd8acc9adb41dde3ed996e34a7f19e45dd (diff) | |
| parent | 3162c9a1d7d032d86c3fafbd9d5c9fe26fda3e29 (diff) | |
| download | servo-9d9fff3b0ad843286875051e6544b3d4750d6238.tar.gz servo-9d9fff3b0ad843286875051e6544b3d4750d6238.zip | |
Auto merge of #23491 - jdm:openssl-windows, r=Manishearth
Switch windows openssl binaries to ones generated by vcpkg.
The current generated binaries we rely upon don't support arm64. These changes will be required for #23468.
<!-- 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/23491)
<!-- Reviewable:end -->
Diffstat (limited to 'python/servo/command_base.py')
| -rw-r--r-- | python/servo/command_base.py | 16 |
1 files changed, 12 insertions, 4 deletions
diff --git a/python/servo/command_base.py b/python/servo/command_base.py index a7e6ead3bf0..0902a956912 100644 --- a/python/servo/command_base.py +++ b/python/servo/command_base.py @@ -584,7 +584,6 @@ install them, let us know by filing a bug!") extra_path = [] extra_lib = [] if "msvc" in (target or host_triple()): - msvc_x64 = "64" if "x86_64" in (target or host_triple()) else "" msvc_deps_dir = path.join(self.context.sharedir, "msvc-dependencies") def package_dir(package): @@ -593,10 +592,19 @@ install them, let us know by filing a bug!") extra_path += [path.join(package_dir("cmake"), "bin")] extra_path += [path.join(package_dir("llvm"), "bin")] extra_path += [path.join(package_dir("ninja"), "bin")] + + arch = (target or host_triple()).split('-')[0] + vcpkg_arch = { + "x86_64": "x64-windows", + "i686": "x86-windows", + "aarch64": "arm64-windows", + } + openssl_base_dir = path.join(package_dir("openssl"), vcpkg_arch[arch]) + # Link openssl - env["OPENSSL_INCLUDE_DIR"] = path.join(package_dir("openssl"), "include") - env["OPENSSL_LIB_DIR"] = path.join(package_dir("openssl"), "lib" + msvc_x64) - env["OPENSSL_LIBS"] = "libsslMD:libcryptoMD" + env["OPENSSL_INCLUDE_DIR"] = path.join(openssl_base_dir, "include") + env["OPENSSL_LIB_DIR"] = path.join(openssl_base_dir, "lib") + env["OPENSSL_LIBS"] = "libeay32:ssleay32" # Link moztools, used for building SpiderMonkey env["MOZTOOLS_PATH"] = os.pathsep.join([ path.join(package_dir("moztools"), "bin"), |