mach: Do not manually install toolchain for non-cross builds (#33190)

* mach: Do not manually install toolchain for non-cross builds

This fixes the Apple Silicon build where the installed toolchain does
not match the host triple. We only install toolchains manually for cross
builds, because cargo and friends will do this automatically when
executing.

Signed-off-by: Martin Robinson <mrobinson@igalia.com>

* fix lints

Signed-off-by: Mukilan Thiyagarajan <mukilan@igalia.com>

---------

Signed-off-by: Martin Robinson <mrobinson@igalia.com>
Signed-off-by: Mukilan Thiyagarajan <mukilan@igalia.com>
Co-authored-by: Mukilan Thiyagarajan <mukilan@igalia.com>

1 files changed, 10 insertions, 6 deletions

diff --git a/python/servo/command_base.py b/python/servo/command_base.py
index 016022c6c41..01dac1ca7fb 100644
--- a/python/servo/command_base.py
+++ b/python/servo/command_base.py
@@ -799,16 +799,20 @@ class CommandBase(object):
             return
 
         servo.platform.get().passive_bootstrap()
+        self.context.bootstrapped = True
+
+        # Toolchain installation is handled automatically for non cross compilation builds.
+        if not self.target.is_cross_build():
+            return
 
-        needs_toolchain_install = self.target.triple() not in \
-            check_output(["rustup", "target", "list", "--installed"],
-                         cwd=self.context.topdir).decode()
-        if needs_toolchain_install:
+        installed_targets = check_output(
+            ["rustup", "target", "list", "--installed"],
+            cwd=self.context.topdir
+        ).decode()
+        if self.target.triple() not in installed_targets:
             check_call(["rustup", "target", "add", self.target.triple()],
                        cwd=self.context.topdir)
 
-        self.context.bootstrapped = True
-
     def ensure_rustup_version(self):
         try:
             version_line = subprocess.check_output(