mirror of
https://github.com/servo/servo.git
synced 2025-06-21 15:49:04 +01:00
Remove gold hack, since it's in rustc automatically now
This commit is contained in:
parent
74f6c9b74f
commit
2955d895a4
2 changed files with 0 additions and 8 deletions
|
@ -1,2 +0,0 @@
|
||||||
#!/bin/sh
|
|
||||||
rustc -C link-args=-fuse-ld=gold "$@"
|
|
|
@ -11,7 +11,6 @@ import os
|
||||||
from os import path
|
from os import path
|
||||||
import contextlib
|
import contextlib
|
||||||
import subprocess
|
import subprocess
|
||||||
from subprocess import PIPE
|
|
||||||
import sys
|
import sys
|
||||||
import toml
|
import toml
|
||||||
|
|
||||||
|
@ -101,7 +100,6 @@ class CommandBase(object):
|
||||||
if not self.config["tools"]["system-cargo"]:
|
if not self.config["tools"]["system-cargo"]:
|
||||||
self.config["tools"]["cargo-root"] = path.join(
|
self.config["tools"]["cargo-root"] = path.join(
|
||||||
context.sharedir, "cargo", self.cargo_build_id())
|
context.sharedir, "cargo", self.cargo_build_id())
|
||||||
self.config["tools"].setdefault("rustc-with-gold", True)
|
|
||||||
|
|
||||||
self.config.setdefault("build", {})
|
self.config.setdefault("build", {})
|
||||||
self.config["build"].setdefault("android", False)
|
self.config["build"].setdefault("android", False)
|
||||||
|
@ -316,10 +314,6 @@ class CommandBase(object):
|
||||||
|
|
||||||
env['RUSTDOC'] = path.join(self.context.topdir, 'etc', 'rustdoc-with-private')
|
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
|
return env
|
||||||
|
|
||||||
def servo_crate(self):
|
def servo_crate(self):
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue