Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-06-21 07:38:59 +01:00
Code Issues Projects Releases Packages Wiki Activity

Fix #12359: make ensure_bootstrap check for host std if rustc exists.

Browse source
This commit is contained in:
Simon Sapin 2016-07-09 00:33:12 +02:00
parent e2262882ad
commit 38b6b24a5d
1 changed files with 3 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
python/servo/command_base.py
View file

@ -434,10 +434,9 @@ class CommandBase(object):
rustc_binary_exists = path.exists(rustc_path) rustc_binary_exists = path.exists(rustc_path)
base_target_path = path.join(rust_root, "rustc", "lib", "rustlib") 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 or host_triple())
target_path = path.join(base_target_path, target) target_exists = path.exists(target_path)
target_exists = path.exists(target_path)
if not (self.config['tools']['system-rust'] or (rustc_binary_exists and target_exists)): if not (self.config['tools']['system-rust'] or (rustc_binary_exists and target_exists)):
print("looking for rustc at %s" % (rustc_path)) print("looking for rustc at %s" % (rustc_path))