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 $CARGO_HOME only if cargo-home-dir is in .servobuild

Browse source 
This preserved the fix from #11097 in the situation where `$CARGO_HOME` and
`cargo-home-dir` in `.servobuild` are both present: `.servobuild` should win.

But it changes the behavior when `$CARGO_HOME` is present and `.servobuild` is
not:  Then `$CARGO_HOME` should be used.

We now check the following values in order of priority and use the first one
that is found:

1. `cargo-home-dir` in `.servobuild`
2. `CARGO_HOME_DIR` in the enivironment
3. default value (`<servo-repo>/.cargo`)
This commit is contained in:
Matt Brubeck 2016-05-11 11:11:16 -07:00
parent a834bc1ec7
commit ce5d9bc819
1 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
python/servo/command_base.py
View file

@ -149,8 +149,9 @@ class CommandBase(object):
self.config["tools"].setdefault("cache-dir", default_cache_dir)
resolverelative("tools", "cache-dir")
self.config["tools"].setdefault("cargo-home-dir",
path.join(context.topdir, ".cargo"))
default_cargo_home = os.environ.get("CARGO_HOME",
path.join(context.topdir, ".cargo"))
self.config["tools"].setdefault("cargo-home-dir", default_cargo_home)
resolverelative("tools", "cargo-home-dir")
context.sharedir = self.config["tools"]["cache-dir"]