Bug 1369665 - "mach vendor rust" has to export the OpenSSL lib folder. r=rillian
authorHenrik Skupin <mail@hskupin.info>
Fri, 02 Jun 2017 12:04:54 +0200
changeset 410204 d62f2d63e674eb78ba995bec230c3c0a3b8d7c19
parent 410203 8fe7c30a22028584204bc88fe7c2bd277c0a43a2
child 410205 71d8ec8f89d49c2242970902630617bc2be9f603
push id7391
push usermtabara@mozilla.com
push dateMon, 12 Jun 2017 13:08:53 +0000
treeherdermozilla-beta@2191d7f87e2e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersrillian
bugs1369665
milestone55.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
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
python/mozbuild/mozbuild/vendor_rust.py
--- 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.