diff options
| author | bors-servo <metajack+bors@gmail.com> | 2015-04-21 19:35:44 -0500 |
|---|---|---|
| committer | bors-servo <metajack+bors@gmail.com> | 2015-04-21 19:35:44 -0500 |
| commit | 5502b5147f1e539032e6739fe8aa96c495ca2fae (patch) | |
| tree | 49679a05adf862670884d5da1cbb657458d83690 /python/servo/build_commands.py | |
| parent | 533949150b7139ddbd22e1df3585fa959d376001 (diff) | |
| parent | b4b828260c2948a3baaac67e22556c06c2821e25 (diff) | |
| download | servo-5502b5147f1e539032e6739fe8aa96c495ca2fae.tar.gz servo-5502b5147f1e539032e6739fe8aa96c495ca2fae.zip | |
Auto merge of #5784 - mbrubeck:ssl-static, r=larsbergstrom
Required by the latest version of the openssl-sys build script. Fixes #5145.
r? @larsbergstrom or @glennw
<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/5784)
<!-- Reviewable:end -->
Diffstat (limited to 'python/servo/build_commands.py')
| -rw-r--r-- | python/servo/build_commands.py | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/python/servo/build_commands.py b/python/servo/build_commands.py index 285f24d2534..d34a271efd0 100644 --- a/python/servo/build_commands.py +++ b/python/servo/build_commands.py @@ -139,6 +139,7 @@ class MachCommands(CommandBase): openssl_dir = path.join(self.android_support_dir(), "openssl-1.0.1k") env['OPENSSL_LIB_DIR'] = openssl_dir env['OPENSSL_INCLUDE_DIR'] = path.join(openssl_dir, "include") + env['OPENSSL_STATIC'] = 'TRUE' status = subprocess.call( ["cargo", "build"] + opts, |