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

Auto merge of #11097 - saneyuki:cargo_home, r=larsbergstrom

Browse source 
Override always 'CARGO_HOME' env variable.

This use always `cargo-home-dir` in `/.servobuild` even if you set `CARGO_HOME` in your shell.

If you use [racer][racer] with [rustup (multirust.rs)][rustup], you may set `CARGO_HOME` env variable to your shell. Then the previous code would be a problem which does not use `cargo-home-dir` in `/.servobuild`.

[racer]: https://github.com/phildawes/racer
[rustup]: https://github.com/rust-lang-nursery/rustup.rs

<!-- 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/11097)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2016-05-10 08:20:47 -07:00
commit 0617727f5b
1 changed files with 1 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
python/servo/command_base.py
View file

@ -293,8 +293,7 @@ class CommandBase(object):
if extra_path:
env["PATH"] = "%s%s%s" % (os.pathsep.join(extra_path), os.pathsep, env["PATH"])
if "CARGO_HOME" not in env:
env["CARGO_HOME"] = self.config["tools"]["cargo-home-dir"]
env["CARGO_HOME"] = self.config["tools"]["cargo-home-dir"]
if "CARGO_TARGET_DIR" not in env:
env["CARGO_TARGET_DIR"] = path.join(self.context.topdir, "target")