Bug 1369665 - "mach vendor rust" has to export the OpenSSL lib folder.
It's not enough to only export the include folder for openssl, but for
linking the lib folder is also necessary. Also DEP_OPENSSL_INCLUDE
shouldn't be set directly, because it's set by Cargo itself based
on the output of openssl-sys's build script.
MozReview-Commit-ID: Ijbx7STgCXq
--- a/python/mozbuild/mozbuild/vendor_rust.py
+++ b/python/mozbuild/mozbuild/vendor_rust.py
@@ -81,20 +81,20 @@ Please commit or stash these changes bef
test_paths = ['/usr/include', '/usr/local/include']
if any([os.path.exists(os.path.join(path, 'openssl/ssl.h')) for path in test_paths]):
# Assume we can use one of these system headers.
return None
if os.path.exists('/usr/local/opt/openssl/include/openssl/ssl.h'):
# Found a likely homebrew install.
self.log(logging.INFO, 'openssl', {},
- 'Using OpenSSL in /usr/local/opt/openssl')
+ 'Using OpenSSL in /usr/local/opt/openssl')
return {
- 'OPENSSL_INCLUDE_DIR': '/usr/local/opt/openssl/include',
- 'DEP_OPENSSL_INCLUDE': '/usr/local/opt/openssl/include',
+ 'OPENSSL_INCLUDE_DIR': '/usr/local/opt/openssl/include',
+ 'OPENSSL_LIB_DIR': '/usr/local/opt/openssl/lib',
}
self.log(logging.ERROR, 'openssl', {}, "OpenSSL not found!")
return None
def _ensure_cargo(self):
'''
Ensures all the necessary cargo bits are installed.