diff options
| author | Jeremy Lempereur <jeremy.lempereur-prestataire@fia-net.com> | 2017-06-08 19:44:57 +0200 |
|---|---|---|
| committer | Jeremy Lempereur <jeremy.lempereur-prestataire@fia-net.com> | 2017-06-12 07:55:03 +0200 |
| commit | a02c074ba9b5da98b305d31cea3d9936e700b730 (patch) | |
| tree | c91f63e34d98e1675766b4fdee87e2e0d6b98714 /python/servo/build_commands.py | |
| parent | 71eb672923365095c45cbd15ee0746eae3908cb6 (diff) | |
| download | servo-a02c074ba9b5da98b305d31cea3d9936e700b730.tar.gz servo-a02c074ba9b5da98b305d31cea3d9936e700b730.zip | |
Changed the openssl url and bumped the version. Refactored the openssl.sh script to avoid version duplication in the code.
Diffstat (limited to 'python/servo/build_commands.py')
| -rw-r--r-- | python/servo/build_commands.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/python/servo/build_commands.py b/python/servo/build_commands.py index 93ea76e63c7..e118318f8f9 100644 --- a/python/servo/build_commands.py +++ b/python/servo/build_commands.py @@ -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' |