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

Auto merge of #5966 - mbrubeck:openssl-status, r=Ms2ger

Browse source 
<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/5966)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2015-05-06 11:58:39 -05:00
commit e39ed1eaae
1 changed files with 2 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

2
python/servo/build_commands.py
View file

@ -136,6 +136,8 @@ class MachCommands(CommandBase):
status = subprocess.call( status = subprocess.call(
make_cmd + ["-f", "openssl.makefile"], make_cmd + ["-f", "openssl.makefile"],
env=self.build_env()) env=self.build_env())
if status:
return status
openssl_dir = path.join(self.android_support_dir(), "openssl-1.0.1k") openssl_dir = path.join(self.android_support_dir(), "openssl-1.0.1k")
env['OPENSSL_LIB_DIR'] = openssl_dir env['OPENSSL_LIB_DIR'] = openssl_dir
env['OPENSSL_INCLUDE_DIR'] = path.join(openssl_dir, "include") env['OPENSSL_INCLUDE_DIR'] = path.join(openssl_dir, "include")