Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-06-06 16:45:39 +00:00
Code Issues Projects Releases Packages Wiki Activity

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

Browse source 
Fixes #7247.
This commit is contained in:
Simon Sapin 2015-08-17 09:19:29 +02:00
parent fb7a53c6cf
commit 1dab9294f4
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 "$@"

5
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,7 +304,9 @@ 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')
env['RUSTC'] = path.join(self.context.topdir, 'etc', '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