diff options
| author | bors-servo <lbergstrom+bors@mozilla.com> | 2016-07-06 07:31:08 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-07-06 07:31:08 -0700 |
| commit | beff8ee68f9116971e8d14b182a574ef9f42a994 (patch) | |
| tree | 9d0c778c72fe6e79ec700c715d7e61da40c5c2d4 | |
| parent | 4aaae7a4e69fd0dfb10b562d6a78ddfe3972d8f1 (diff) | |
| parent | a824177bf13fd7f23f04e5c3e4628f33c9c4ab0c (diff) | |
| download | servo-beff8ee68f9116971e8d14b182a574ef9f42a994.tar.gz servo-beff8ee68f9116971e8d14b182a574ef9f42a994.zip | |
Auto merge of #12271 - mbrubeck:host_triple, r=emilio
Fix installation location for downloaded std packages
Fixes a "can't find crate for `std`" error in mach build. Regression from #11945. r? @larsbergstrom
<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="35" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/12271)
<!-- Reviewable:end -->
| -rw-r--r-- | python/servo/bootstrap_commands.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/python/servo/bootstrap_commands.py b/python/servo/bootstrap_commands.py index 27ac96ff97d..a4cf509f113 100644 --- a/python/servo/bootstrap_commands.py +++ b/python/servo/bootstrap_commands.py @@ -211,7 +211,7 @@ class MachCommands(CommandBase): "rust-std%s%s-%s" % (nightly_suffix, stable_version, target_triple), "rust-std-%s" % target_triple, "lib", "rustlib", target_triple), path.join(install_dir, - "rustc%s%s-%s" % (nightly_suffix, stable_version, host_triple), + "rustc%s%s-%s" % (nightly_suffix, stable_version, host_triple()), "rustc", "lib", "rustlib", target_triple)) shutil.rmtree(path.join(install_dir, "rust-std%s%s-%s" % (nightly_suffix, stable_version, target_triple))) |