mirror of
https://github.com/servo/servo.git
synced 2025-06-28 19:13:41 +01:00
Use openssl dependency that works on arm64.
This commit is contained in:
parent
fdbb317d7a
commit
962a2a0afa
5 changed files with 17 additions and 17 deletions
|
@ -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
|
||||
|
|
|
@ -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"),
|
||||
|
|
|
@ -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",
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue