From 2955d895a4d723bc616f37a55a973c677318a950 Mon Sep 17 00:00:00 2001
From: Lars Bergstrom <lars@lars.com>
Date: Wed, 13 Jan 2016 16:04:12 -0600
Subject: [PATCH] Remove gold hack, since it's in rustc automatically now

---
 etc/rustc-with-gold          | 2 --
 python/servo/command_base.py | 6 ------
 2 files changed, 8 deletions(-)
 delete mode 100755 etc/rustc-with-gold

diff --git a/etc/rustc-with-gold b/etc/rustc-with-gold
deleted file mode 100755
index 077aa7f0d0b..00000000000
--- a/etc/rustc-with-gold
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-rustc -C link-args=-fuse-ld=gold "$@"
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):