Bug 1369665 - "mach vendor rust" has to export the OpenSSL lib folder. r=rillian

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

--HG--
extra : rebase_source : 9f93d20f974eb85e0e96fdfb017a402a263330ef
This commit is contained in:
Henrik Skupin 2017-06-02 12:04:54 +02:00
Родитель d2a2df9a3a
Коммит 4a263baef5
1 изменённых файлов: 3 добавлений и 3 удалений

Просмотреть файл

@ -86,10 +86,10 @@ Please commit or stash these changes before vendoring, or re-run with `--ignore-
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!")