mirror of
https://github.com/servo/servo.git
synced 2025-06-13 19:04:30 +00:00
Only use a rustc wrapper script when ld.gold is available.
Fixes #7247.
This commit is contained in:
parent
fb7a53c6cf
commit
1dab9294f4
2 changed files with 5 additions and 4 deletions
|
@ -11,6 +11,7 @@ import os
|
|||
from os import path
|
||||
import contextlib
|
||||
import subprocess
|
||||
from subprocess import PIPE
|
||||
import sys
|
||||
import toml
|
||||
|
||||
|
@ -303,7 +304,9 @@ class CommandBase(object):
|
|||
env['HOST_FILE'] = hosts_file_path
|
||||
|
||||
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
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue