diff options
| author | bors-servo <lbergstrom+bors@mozilla.com> | 2019-07-24 16:11:14 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-24 16:11:14 -0400 |
| commit | 82f649751c045730419f9d1704305717c4f346ec (patch) | |
| tree | d8c3dee171e12336069d1174679a468804d684fe /python/servo/build_commands.py | |
| parent | b8af92a3efb6d9e97216414357bb92b2cbf29851 (diff) | |
| parent | 5d5d028b5070ddca90664a53898181a2b9e2279d (diff) | |
| download | servo-82f649751c045730419f9d1704305717c4f346ec.tar.gz servo-82f649751c045730419f9d1704305717c4f346ec.zip | |
Auto merge of #23835 - jdm:arm64-openssl, r=paulrouget
Use openssl dependency that works on arm64.
This uses binaries that I generated with https://github.com/servo/openssl-src-rs/tree/servo and https://github.com/servo/openssl/tree/servo that don't crash on arm64.
---
- [x] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors
- [x] These changes fix #23811
- [x] These changes do not require tests can't run automated tests for arm64 windows.
<!-- 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/23835)
<!-- 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 9a0043454c8..d7370881a47 100644 --- a/python/servo/build_commands.py +++ b/python/servo/build_commands.py @@ -578,7 +578,7 @@ class MachCommands(CommandBase): call(["editbin", "/nologo", "/subsystem:windows", path.join(servo_exe_dir, "servo.exe")], verbose=verbose) # on msvc, we need to copy in some DLLs in to the servo.exe dir - for ssl_lib in ["libeay32.dll", "ssleay32.dll"]: + for ssl_lib in ["libssl.dll", "libcrypto.dll"]: shutil.copy(path.join(env['OPENSSL_LIB_DIR'], "../bin", ssl_lib), servo_exe_dir) # Search for the generated nspr4.dll |