Bug 1437201 - Part 2: Install llvm on macOS when bootstrapping mobile/android. r=froydnj
☠☠ backed out by b2c88b9c12f7 ☠ ☠
authorNick Alexander <nalexander@mozilla.com>
Fri, 09 Feb 2018 14:33:30 -0800
changeset 403247 1a206d390b011275f5eb719e6e5f74028d4ebc8d
parent 403246 04e61046bb4414859f2ecfe3ed7ddd5b53910274
child 403248 48cf4fb1409b3e86673d5aa18b00b32f781146d6
push id59410
push usernalexander@mozilla.com
push dateFri, 09 Feb 2018 23:30:02 +0000
treeherderautoland@1a206d390b01 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersfroydnj
bugs1437201
milestone60.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 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.