Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-06-24 17:14:33 +01:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #17815 - servo:bootstrap, r=nox

Browse source 
Fix bootstrapping during `mach rustup` without system cargo

https://travis-ci.org/servo/servo-with-rust-nightly/builds/255611949#L989

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/17815)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2017-07-21 05:00:56 -07:00 • committed by GitHub
commit 3854e8f174
1 changed files with 3 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

3
python/servo/devenv_commands.py
View file

@ -284,6 +284,9 @@ class MachCommands(CommandBase):
# Reset self.config["tools"]["rust-root"]
self._rust_version = None
self.set_use_stable_rust(False)
# Reset self.config["tools"]["cargo-root"]
self._cargo_build_id = None
self.set_cargo_root()
self.fetch()