diff options
| author | bors-servo <lbergstrom+bors@mozilla.com> | 2016-01-15 19:37:07 +0530 |
|---|---|---|
| committer | bors-servo <lbergstrom+bors@mozilla.com> | 2016-01-15 19:37:07 +0530 |
| commit | 4cb2c87982355bdf2a2dd409db71d0d4ed6f9a85 (patch) | |
| tree | 0a663ec35171c66d95b6a02c90000062e3067237 /python/servo/command_base.py | |
| parent | 679d1280dd0581621ed55cafc3a863d39ecd6934 (diff) | |
| parent | 94e708f2f313b4b67ddb3f08092d8197b0194ea4 (diff) | |
| download | servo-4cb2c87982355bdf2a2dd409db71d0d4ed6f9a85.tar.gz servo-4cb2c87982355bdf2a2dd409db71d0d4ed6f9a85.zip | |
Auto merge of #9093 - servo:rustup, r=KiChjang
Update to rustc 1.7.0-nightly (b4707ebca 2015-12-27)
<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/9093)
<!-- Reviewable:end -->
Diffstat (limited to 'python/servo/command_base.py')
| -rw-r--r-- | python/servo/command_base.py | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/python/servo/command_base.py b/python/servo/command_base.py index 2d8ccc5a122..b2ff5094e33 100644 --- a/python/servo/command_base.py +++ b/python/servo/command_base.py @@ -11,7 +11,6 @@ import os from os import path import contextlib import subprocess -from subprocess import PIPE import sys import toml @@ -101,7 +100,6 @@ 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) @@ -316,10 +314,6 @@ 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): |