servo: Merge #12271 - Fix installation location for downloaded std packages (from mbrubeck:host_triple); r=emilio

Fixes a "can't find crate for `std`" error in mach build. Regression from #11945. r? @larsbergstrom

Source-Repo: https://github.com/servo/servo
Source-Revision: beff8ee68f9116971e8d14b182a574ef9f42a994
This commit is contained in:
Matt Brubeck 2016-07-06 07:31:08 -07:00
Родитель 3e1bc4c055
Коммит 963bd5a370
1 изменённых файлов: 1 добавлений и 1 удалений

Просмотреть файл

@ -211,7 +211,7 @@ class MachCommands(CommandBase):
"rust-std%s%s-%s" % (nightly_suffix, stable_version, target_triple), "rust-std%s%s-%s" % (nightly_suffix, stable_version, target_triple),
"rust-std-%s" % target_triple, "lib", "rustlib", target_triple), "rust-std-%s" % target_triple, "lib", "rustlib", target_triple),
path.join(install_dir, 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)) "rustc", "lib", "rustlib", target_triple))
shutil.rmtree(path.join(install_dir, shutil.rmtree(path.join(install_dir,
"rust-std%s%s-%s" % (nightly_suffix, stable_version, target_triple))) "rust-std%s%s-%s" % (nightly_suffix, stable_version, target_triple)))