Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-05 13:40:08 +01:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #7249 - servo:gold, r=paulrouget

Browse source 
Only use a rustc wrapper script when ld.gold is available.

Fixes #7247.

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.png" height=40 alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/7249)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2015-08-17 01:26:26 -06:00
commit 95c6301cf4
2 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
etc/rustc-with-gold
View file

@ -1,4 +1,2 @@
#!/bin/sh #!/bin/sh
EXTRA_ARGS="" rustc -C link-args=-fuse-ld=gold "$@"
which ld.gold > /dev/null 2>&1 && EXTRA_ARGS="-C link-args=-fuse-ld=gold"
rustc $EXTRA_ARGS "$@"

3
python/servo/command_base.py
View file

@ -11,6 +11,7 @@ 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
@ -303,6 +304,8 @@ class CommandBase(object):
env['HOST_FILE'] = hosts_file_path env['HOST_FILE'] = hosts_file_path
env['RUSTDOC'] = path.join(self.context.topdir, 'etc', 'rustdoc-with-private') env['RUSTDOC'] = path.join(self.context.topdir, 'etc', 'rustdoc-with-private')
if subprocess.call(['which', 'ld.gold'], stdout=PIPE, stderr=PIPE) == 0:
env['RUSTC'] = path.join(self.context.topdir, 'etc', 'rustc-with-gold') env['RUSTC'] = path.join(self.context.topdir, 'etc', 'rustc-with-gold')
return env return env