|
| 1 | +diff --git a/python/mozboot/mozboot/osx.py b/python/mozboot/mozboot/osx.py |
| 2 | +index 8c8c478d2ef6bb7a0ba45a67cfb694d13fce3716..82ed833ea14db8de47e5aec9dd0f049e99b5973c 100644 |
| 3 | +--- a/python/mozboot/mozboot/osx.py |
| 4 | ++++ b/python/mozboot/mozboot/osx.py |
| 5 | +@@ -284,16 +284,23 @@ class OSXBootstrapper(OSXAndroidBootstrapper, BaseBootstrapper): |
| 6 | + self.install_homebrew() |
| 7 | + |
| 8 | + def ensure_clang_static_analysis_package(self): |
| 9 | +- from mozboot import static_analysis |
| 10 | ++ # NOTE: This function has been removed as it caused numerous problems |
| 11 | ++ # with the boostrap process for v100.0.2. May be fixed in the future, |
| 12 | ++ # so we can return it |
| 13 | ++ pass |
| 14 | ++ # from mozboot import static_analysis |
| 15 | + |
| 16 | +- self.install_toolchain_static_analysis(static_analysis.MACOS_CLANG_TIDY) |
| 17 | ++ # self.install_toolchain_static_analysis(static_analysis.MACOS_CLANG_TIDY) |
| 18 | + |
| 19 | + def ensure_sccache_packages(self): |
| 20 | + from mozboot import sccache |
| 21 | + |
| 22 | + self.install_toolchain_artifact("sccache") |
| 23 | + self.install_toolchain_artifact(sccache.RUSTC_DIST_TOOLCHAIN, no_unpack=True) |
| 24 | +- self.install_toolchain_artifact(sccache.CLANG_DIST_TOOLCHAIN, no_unpack=True) |
| 25 | ++ # NOTE: This function has been removed as it caused numerous problems |
| 26 | ++ # with the boostrap process for v100.0.2. May be fixed in the future, |
| 27 | ++ # so we can return it |
| 28 | ++ # self.install_toolchain_artifact(sccache.CLANG_DIST_TOOLCHAIN, no_unpack=True) |
| 29 | + |
| 30 | + def ensure_fix_stacks_packages(self): |
| 31 | + self.install_toolchain_artifact("fix-stacks") |
0 commit comments