mirror of
https://github.com/servo/servo.git
synced 2025-08-04 13:10:20 +01:00
Auto merge of #17240 - o0Ignition0o:openssl_from_mirror, r=jdm
#17079 : Changed the openssl url and bumped the version. <!-- Please describe your changes on the following line: --> Changed the openssl url and bumped the version. It's a wip because I haven't figured out a relevant way to write a test about it yet. --- <!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: --> - [X] `./mach build -d` does not report any errors - [X] `./mach test-tidy` does not report any errors - [X] These changes fix #17079 (github issue number if applicable). <!-- Either: --> - [ ] There are tests for these changes OR - [X] These changes do not require tests because The mach command will fail if anything goes wrong. <!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.--> <!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. --> <!-- Reviewable:start --> --- This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/17240) <!-- Reviewable:end -->
This commit is contained in:
commit
d7dff8e6d1
3 changed files with 9 additions and 8 deletions
|
@ -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'
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue