diff options
| author | Josh Matthews <josh@joshmatthews.net> | 2019-07-23 09:00:41 -0400 |
|---|---|---|
| committer | Josh Matthews <josh@joshmatthews.net> | 2019-07-23 09:00:41 -0400 |
| commit | 962a2a0afaef6ca209c1b366b7d6cc4664a1df00 (patch) | |
| tree | 9e67ba4738b5fcc1bb9755b0052827db0e77de47 /python/servo | |
| parent | fdbb317d7a241928d08e40dfd5b0ae3003ecba51 (diff) | |
| download | servo-962a2a0afaef6ca209c1b366b7d6cc4664a1df00.tar.gz servo-962a2a0afaef6ca209c1b366b7d6cc4664a1df00.zip | |
Use openssl dependency that works on arm64.
Diffstat (limited to 'python/servo')
| -rw-r--r-- | python/servo/build_commands.py | 2 | ||||
| -rw-r--r-- | python/servo/command_base.py | 2 | ||||
| -rw-r--r-- | python/servo/packages.py | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/python/servo/build_commands.py b/python/servo/build_commands.py index 814fa36b76e..4ad405af6a6 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 diff --git a/python/servo/command_base.py b/python/servo/command_base.py index 57e729dc92c..e8807397034 100644 --- a/python/servo/command_base.py +++ b/python/servo/command_base.py @@ -610,7 +610,7 @@ install them, let us know by filing a bug!") # Link openssl 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" + env["OPENSSL_LIBS"] = "libssl:libcrypto" # Link moztools, used for building SpiderMonkey env["MOZTOOLS_PATH"] = os.pathsep.join([ path.join(package_dir("moztools"), "bin"), diff --git a/python/servo/packages.py b/python/servo/packages.py index 3e7e3ccf67c..2d10156ad22 100644 --- a/python/servo/packages.py +++ b/python/servo/packages.py @@ -7,5 +7,5 @@ WINDOWS_MSVC = { "llvm": "8.0.0", "moztools": "3.2", "ninja": "1.7.1", - "openssl": "1.0.2q-vs2017", + "openssl": "111.3.0+1.1.1c-vs2017", } |