Commit a52c2b20 authored by Lukas Piatkowski's avatar Lukas Piatkowski Committed by Facebook GitHub Bot

mononoke/integration: build EdenSCM with non system OpenSSL (#12)

Summary:
Pull Request resolved: https://github.com/facebookexperimental/rust-shed/pull/12

The OpenSSL version on Mac doesn't work well with EdenSCM and Mononoke integration, just use the one from getdeps/brew.

Also remove the now redundant "DEVELOPER_DIR" since the modern XCode version works.

Pull Request resolved: https://github.com/facebookexperimental/eden/pull/63

Reviewed By: StanislavGlebik

Differential Revision: D23927022

Pulled By: lukaspiatkowski

fbshipit-source-id: 6b6b3baa33d49b567b9aa6178cbd20b7ae9edc89
parent 67b7c2ad
......@@ -269,12 +269,11 @@ class BuildOptions(object):
env["RUSTC"] = rustc_path
env["RUSTDOC"] = rustdoc_path
if self.is_windows():
libcrypto = os.path.join(d, "lib/libcrypto.lib")
else:
libcrypto = os.path.join(d, "lib/libcrypto.so")
openssl_include = os.path.join(d, "include/openssl")
if os.path.isfile(libcrypto) and os.path.isdir(openssl_include):
if os.path.isdir(openssl_include) and any(
os.path.isfile(os.path.join(d, "lib", libcrypto))
for libcrypto in ("libcrypto.lib", "libcrypto.so", "libcrypto.a")
):
# This must be the openssl library, let Rust know about it
env["OPENSSL_DIR"] = d
......
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