Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-07 14:35:33 +01:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #9440 - adamncasey:fix-multirust, r=jdm

Browse source 
Prepend PATH extras instead of append (Fix Issue #9437)

Should fix multirust issue https://github.com/servo/servo/issues/9437 which appeared after https://github.com/servo/servo/pull/9415 landed.

@jdm to confirm

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.svg" height="40" alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/9440)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2016-01-27 19:17:29 +05:30
commit 03b763c2c5
1 changed files with 1 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
python/servo/command_base.py
View file

@ -273,7 +273,7 @@ class CommandBase(object):
path.join(self.config["tools"]["cargo-root"], "bin")] path.join(self.config["tools"]["cargo-root"], "bin")]
if extra_path: if extra_path:
env["PATH"] = "%s%s%s" % (env["PATH"], os.pathsep, os.pathsep.join(extra_path)) env["PATH"] = "%s%s%s" % (os.pathsep.join(extra_path), os.pathsep, env["PATH"])
if "CARGO_HOME" not in env: if "CARGO_HOME" not in env:
env["CARGO_HOME"] = self.config["tools"]["cargo-home-dir"] env["CARGO_HOME"] = self.config["tools"]["cargo-home-dir"]