Commit d2715c95 authored by Alex Hornby's avatar Alex Hornby Committed by Facebook GitHub Bot

be more consistent about using system openssl on linux

Summary: System openssl is preferred on Linux

Reviewed By: HarveyHunt

Differential Revision: D32617807

fbshipit-source-id: 30913858b7f4172cea3d819a63d57563b3da64aa
parent 573a9547
...@@ -53,8 +53,11 @@ fbcode/fboss/common = common ...@@ -53,8 +53,11 @@ fbcode/fboss/common = common
[dependencies] [dependencies]
fb303-source fb303-source
fbthrift-source fbthrift-source
openssl
rust-shed rust-shed
# We use the system openssl on linux
[dependencies.not(os=linux)]
openssl
[dependencies.fb=on] [dependencies.fb=on]
rust rust
...@@ -13,7 +13,8 @@ libssl-dev ...@@ -13,7 +13,8 @@ libssl-dev
url = https://www.openssl.org/source/openssl-1.1.1i.tar.gz url = https://www.openssl.org/source/openssl-1.1.1i.tar.gz
sha256 = e8be6a35fe41d10603c3cc635e93289ed00bf34b79671a3a4de64fcee00d5242 sha256 = e8be6a35fe41d10603c3cc635e93289ed00bf34b79671a3a4de64fcee00d5242
[build] # We use the system openssl on linux
[build.not(os=linux)]
builder = openssl builder = openssl
subdir = openssl-1.1.1i subdir = openssl-1.1.1i
......
...@@ -25,9 +25,9 @@ tools/rust/ossconfigs = . ...@@ -25,9 +25,9 @@ tools/rust/ossconfigs = .
[dependencies] [dependencies]
fbthrift fbthrift
# macOS doesn't expose the openssl api so we need to build our own.
# Windows doesn't have openssl and Linux might contain an old version, # We use the system openssl on linux
# so we get to provide it [dependencies.not(os=linux)]
openssl openssl
[dependencies.fb=on] [dependencies.fb=on]
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment