Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-06-20 15:18:58 +01:00
Code Issues Projects Releases Packages Wiki Activity

Override always 'CARGO_HOME' env variable.

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.
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
This commit is contained in:
Tetsuharu OHZEKI 2016-05-10 02:04:12 +09:00
parent 58a9b31de2
commit cb90f22c3e
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")