diff options
author | bors-servo <lbergstrom+bors@mozilla.com> | 2017-03-08 09:46:58 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2017-03-08 09:46:58 -0800 |
commit | 2ad2e095719bc489e9902a64fccddffe2c5662d2 (patch) | |
tree | d6ff569659009cfaba4602ae901402fd386c8b7a /python | |
parent | 728a249dea74acde598edbcbd4eb0512ddd267ba (diff) | |
parent | 79275ab68c263eb5048ef69b994c680ec81b3b1f (diff) | |
download | servo-2ad2e095719bc489e9902a64fccddffe2c5662d2.tar.gz servo-2ad2e095719bc489e9902a64fccddffe2c5662d2.zip |
Auto merge of #15875 - mbrubeck:bootstrap-stable, r=nox
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 -->
Diffstat (limited to 'python')
-rw-r--r-- | python/servo/bootstrap_commands.py | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/python/servo/bootstrap_commands.py b/python/servo/bootstrap_commands.py index aa298611825..998bb5a19b7 100644 --- a/python/servo/bootstrap_commands.py +++ b/python/servo/bootstrap_commands.py @@ -71,7 +71,8 @@ class MachCommands(CommandBase): rust_dir = path.join(self.context.sharedir, "rust", rust_path) install_dir = path.join(self.context.sharedir, "rust", version) 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)): print("Rust compiler already downloaded.", end=" ") |