Download extra std lib when cross-compiling #9557

Split ensure_bootstrap into two phases including a phase checking the
compiler, and a phase checking for target libraries.

1 files changed, 7 insertions, 4 deletions

diff --git a/python/servo/command_base.py b/python/servo/command_base.py
index 450403e903b..d43c3ab4eda 100644
--- a/python/servo/command_base.py
+++ b/python/servo/command_base.py
@@ -394,18 +394,21 @@ class CommandBase(object):
     def android_build_dir(self, dev):
         return path.join(self.get_target_dir(), "arm-linux-androideabi", "debug" if dev else "release")
 
-    def ensure_bootstrapped(self):
+    def ensure_bootstrapped(self, targets=[]):
         if self.context.bootstrapped:
             return
 
         Registrar.dispatch("update-submodules", context=self.context)
 
         if not self.config["tools"]["system-rust"] and \
-           not path.exists(path.join(
-                self.config["tools"]["rust-root"], "rustc", "bin", "rustc" + BIN_SUFFIX)):
+           (not path.exists(path.join(
+                            self.config["tools"]["rust-root"], "rustc", "bin", "rustc" + BIN_SUFFIX)) or
+                not all([path.exists(path.join(
+                        self.config["tools"]["rust-root"], "rustc", "lib", "rustlib", x
+                        )) for x in targets])):
             print("looking for rustc at %s" % path.join(
                 self.config["tools"]["rust-root"], "rustc", "bin", "rustc" + BIN_SUFFIX))
-            Registrar.dispatch("bootstrap-rust", context=self.context)
+            Registrar.dispatch("bootstrap-rust", context=self.context, target=targets)
         if not self.config["tools"]["system-cargo"] and \
            not path.exists(path.join(
                 self.config["tools"]["cargo-root"], "cargo", "bin", "cargo" + BIN_SUFFIX)):