aboutsummaryrefslogtreecommitdiffstats
path: root/python/servo
diff options
context:
space:
mode:
authorbors-servo <metajack+bors@gmail.com>2014-11-17 09:21:28 -0700
committerbors-servo <metajack+bors@gmail.com>2014-11-17 09:21:28 -0700
commit2bda68f03862ae9b58673d7685ec80e61d5ba65e (patch)
treec9c1fe30ca9f230c154207b18b297f953fdef666 /python/servo
parentbd4f94a11f556451634ac073e690fa42816e5580 (diff)
parent3cacb029ccc111f01fe6268bc22ae5ce53757c4b (diff)
downloadservo-2bda68f03862ae9b58673d7685ec80e61d5ba65e.tar.gz
servo-2bda68f03862ae9b58673d7685ec80e61d5ba65e.zip
auto merge of #3987 : mbrubeck/servo/rust-root, r=larsbergstrom
r? @larsbergstrom
Diffstat (limited to 'python/servo')
-rw-r--r--python/servo/command_base.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/python/servo/command_base.py b/python/servo/command_base.py
index 96cf287b329..8dc872e8656 100644
--- a/python/servo/command_base.py
+++ b/python/servo/command_base.py
@@ -109,6 +109,7 @@ class CommandBase(object):
extra_lib = []
if not self.config["tools"]["system-rust"] \
or self.config["tools"]["rust-root"]:
+ env["RUST_ROOT"] = self.config["tools"]["rust-root"]
extra_path += [path.join(self.config["tools"]["rust-root"], "bin")]
extra_lib += [path.join(self.config["tools"]["rust-root"], "lib")]
if not self.config["tools"]["system-cargo"] \