diff options
Diffstat (limited to 'python')
| -rw-r--r-- | python/servo/command_base.py | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/python/servo/command_base.py b/python/servo/command_base.py index 431bb64fd44..1acf5abd832 100644 --- a/python/servo/command_base.py +++ b/python/servo/command_base.py @@ -11,6 +11,7 @@ import os from os import path import contextlib import subprocess +from subprocess import PIPE import sys import toml @@ -153,6 +154,7 @@ class CommandBase(object): if not self.config["tools"]["system-cargo"]: self.config["tools"]["cargo-root"] = path.join( context.sharedir, "cargo", self.cargo_build_id()) + self.config["tools"].setdefault("rustc-with-gold", True) self.config.setdefault("build", {}) self.config["build"].setdefault("android", False) @@ -377,6 +379,10 @@ class CommandBase(object): env['RUSTDOC'] = path.join(self.context.topdir, 'etc', 'rustdoc-with-private') + if self.config["tools"]["rustc-with-gold"]: + if subprocess.call(['which', 'ld.gold'], stdout=PIPE, stderr=PIPE) == 0: + env['RUSTC'] = path.join(self.context.topdir, 'etc', 'rustc-with-gold') + return env def servo_crate(self): |