Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-01 06:35:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

servo: Merge #11097 - Override always 'CARGO_HOME' env variable (from saneyuki:cargo_home); r=larsbergstrom

Browse Source 
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

Source-Repo: https://github.com/servo/servo
Source-Revision: 0617727f5b58d1c4ebb10cf081f5952b7961fbf4
This commit is contained in:
Tetsuharu OHZEKI 2016-05-10 08:20:47 -07:00
parent c11fd6b931
commit b9d8671144
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
servo/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")