From 38b6b24a5da8670b21d18a4074346f5537e3185a Mon Sep 17 00:00:00 2001 From: Simon Sapin Date: Sat, 9 Jul 2016 00:33:12 +0200 Subject: [PATCH] Fix #12359: make ensure_bootstrap check for host std if rustc exists. --- python/servo/command_base.py | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/python/servo/command_base.py b/python/servo/command_base.py index 9990def8516..a814f58fbf9 100644 --- a/python/servo/command_base.py +++ b/python/servo/command_base.py @@ -434,10 +434,9 @@ class CommandBase(object): rustc_binary_exists = path.exists(rustc_path) base_target_path = path.join(rust_root, "rustc", "lib", "rustlib") - target_exists = True - if target is not None: - target_path = path.join(base_target_path, target) - target_exists = path.exists(target_path) + + target_path = path.join(base_target_path, target or host_triple()) + target_exists = path.exists(target_path) if not (self.config['tools']['system-rust'] or (rustc_binary_exists and target_exists)): print("looking for rustc at %s" % (rustc_path))