Skip to content

Commit a6575eb

Browse files
mononoke/integration: build EdenSCM with non system OpenSSL (#12)
Summary: Pull Request resolved: facebookexperimental/rust-shed#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: facebook/sapling#63 Reviewed By: StanislavGlebik Differential Revision: D23927022 Pulled By: lukaspiatkowski fbshipit-source-id: 6b6b3baa33d49b567b9aa6178cbd20b7ae9edc89
1 parent 16ea841 commit a6575eb

File tree

1 file changed

+4
-5
lines changed

1 file changed

+4
-5
lines changed

build/fbcode_builder/getdeps/buildopts.py

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -269,12 +269,11 @@ def compute_env_for_install_dirs(self, install_dirs, env=None, manifest=None):
269269
env["RUSTC"] = rustc_path
270270
env["RUSTDOC"] = rustdoc_path
271271

272-
if self.is_windows():
273-
libcrypto = os.path.join(d, "lib/libcrypto.lib")
274-
else:
275-
libcrypto = os.path.join(d, "lib/libcrypto.so")
276272
openssl_include = os.path.join(d, "include/openssl")
277-
if os.path.isfile(libcrypto) and os.path.isdir(openssl_include):
273+
if os.path.isdir(openssl_include) and any(
274+
os.path.isfile(os.path.join(d, "lib", libcrypto))
275+
for libcrypto in ("libcrypto.lib", "libcrypto.so", "libcrypto.a")
276+
):
278277
# This must be the openssl library, let Rust know about it
279278
env["OPENSSL_DIR"] = d
280279

0 commit comments

Comments
 (0)