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

Auto merge of #15875 - mbrubeck:bootstrap-stable, r=nox

Browse source 
Fix bug bootstrapping stable rust

<!-- Please describe your changes on the following line: -->

---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `__` with appropriate data: -->
- [x] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors
- [ ] These changes fix #__ (github issue number if applicable).

<!-- Either: -->
- [ ] There are tests for these changes OR
- [x] These changes do not require tests because they touch build infrastructure only

<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->

<!-- 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/15875)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2017-03-08 09:46:58 -08:00 • committed by GitHub
commit 2ad2e09571
1 changed files with 2 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

3
python/servo/bootstrap_commands.py
View file

@ -71,7 +71,8 @@ class MachCommands(CommandBase):
rust_dir = path.join(self.context.sharedir, "rust", rust_path) rust_dir = path.join(self.context.sharedir, "rust", rust_path)
install_dir = path.join(self.context.sharedir, "rust", version) install_dir = path.join(self.context.sharedir, "rust", version)
if not self.config["build"]["llvm-assertions"]: if not self.config["build"]["llvm-assertions"]:
install_dir += "-alt" if not self.use_stable_rust():
install_dir += "-alt"
if not force and path.exists(path.join(rust_dir, "rustc", "bin", "rustc" + BIN_SUFFIX)): if not force and path.exists(path.join(rust_dir, "rustc", "bin", "rustc" + BIN_SUFFIX)):
print("Rust compiler already downloaded.", end=" ") print("Rust compiler already downloaded.", end=" ")