Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-06-24 17:14:33 +01:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #5784 - mbrubeck:ssl-static, r=larsbergstrom

Browse source 
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 -->
This commit is contained in:
bors-servo 2015-04-21 19:35:44 -05:00
commit 5502b5147f
1 changed files with 1 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

1
python/servo/build_commands.py
View file

@ -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,