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

Changed the openssl url and bumped the version. Refactored the openssl.sh script to avoid version duplication in the code.

Browse source
This commit is contained in:
Jeremy Lempereur 2017-06-08 19:44:57 +02:00
parent 71eb672923
commit a02c074ba9
3 changed files with 9 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

3
python/servo/build_commands.py
View file

@ -247,6 +247,7 @@ class MachCommands(CommandBase):
if android:
# Build OpenSSL for android
env["OPENSSL_VERSION"] = "1.0.2k"
make_cmd = ["make"]
if jobs is not None:
make_cmd += ["-j" + jobs]
@ -264,7 +265,7 @@ class MachCommands(CommandBase):
verbose=verbose)
if status:
return status
openssl_dir = path.join(openssl_dir, "openssl-1.0.1t")
openssl_dir = path.join(openssl_dir, "openssl-{}".format(env["OPENSSL_VERSION"]))
env['OPENSSL_LIB_DIR'] = openssl_dir
env['OPENSSL_INCLUDE_DIR'] = path.join(openssl_dir, "include")
env['OPENSSL_STATIC'] = 'TRUE'