Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to rustc 1.7.0-nightly (b4707ebca 2015-12-27) #9093

Merged
merged 6 commits into from Jan 15, 2016

Remove gold hack, since it's in rustc automatically now

  • Loading branch information
larsbergstrom committed Jan 15, 2016
commit 2955d895a4d723bc616f37a55a973c677318a950

This file was deleted.

@@ -11,7 +11,6 @@
from os import path
import contextlib
import subprocess
from subprocess import PIPE
import sys
import toml

@@ -101,7 +100,6 @@ def resolverelative(category, key):
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 @@ def build_env(self, gonk=False, hosts_file_path=None):

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):
ProTip! Use n and p to navigate between commits in a pull request.
You can’t perform that action at this time.