Bug 1437201 - Part 2: Install llvm on macOS when bootstrapping mobile/android. r=froydnj draft
authorNick Alexander <nalexander@mozilla.com>
Fri, 09 Feb 2018 14:33:30 -0800
changeset 754568 bcc4fc72ce49390e1200eb5efbe6ee14fccd016c
parent 754567 3716d4ff7ce2f1e796489e02e312d7554a5b1e6c
child 754741 34bb91eb42da01705ef99f56ec47d17241f28dae
push id98924
push usernalexander@mozilla.com
push dateTue, 13 Feb 2018 20:18:37 +0000
reviewersfroydnj
bugs1437201
milestone60.0a1
Bug 1437201 - Part 2: Install llvm on macOS when bootstrapping mobile/android. r=froydnj This was just an oversight when adding Stylo bindgen support to |mach bootstrap| (I assume). MozReview-Commit-ID: 89N6omXGUdy
python/mozboot/mozboot/osx.py
--- a/python/mozboot/mozboot/osx.py
+++ b/python/mozboot/mozboot/osx.py
@@ -322,37 +322,37 @@ class OSXBootstrapper(BaseBootstrapper):
         # Ensure that we can access old versions of packages.  This is
         # idempotent, so no need to avoid repeat invocation.
         self.check_output([self.brew, 'tap', 'caskroom/versions'])
 
         # Change |brew install cask| into |brew cask install cask|.
         return self._ensure_homebrew_packages(casks, extra_brew_args=['cask'])
 
     def ensure_homebrew_system_packages(self):
+        # We need to install Python because Mercurial requires the
+        # Python development headers which are missing from OS X (at
+        # least on 10.8) and because the build system wants a version
+        # newer than what Apple ships.
         packages = [
-            # We need to install Python because Mercurial requires the Python
-            # development headers which are missing from OS X (at least on
-            # 10.8) and because the build system wants a version newer than
-            # what Apple ships.
+            'autoconf@2.13',
+            'git',
+            'gnu-tar',
+            'llvm',
+            'mercurial',
+            'node',
             'python',
             'python3',
-            'mercurial',
-            'git',
-            'autoconf@2.13',
-            'gnu-tar',
+            'terminal-notifier',
             'watchman',
-            'terminal-notifier',
-            'node',
         ]
         self._ensure_homebrew_packages(packages)
 
     def ensure_homebrew_browser_packages(self, artifact_mode=False):
         # TODO: Figure out what not to install for artifact mode
         packages = [
-            'llvm',
             'yasm',
         ]
         self._ensure_homebrew_packages(packages)
 
     def ensure_homebrew_mobile_android_packages(self, artifact_mode=False):
         # Multi-part process:
         # 1. System packages.
         # 2. Android SDK. Android NDK only if we are not in artifact mode. Android packages.