Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-01 06:35:42 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

servo: Merge #9588 - add check for win32 or msys before running rustc-with-gold fixes #9499 (from Jayflux:hotfix/9499); r=Wafflespeanut

Browse Source 
Source-Repo: https://github.com/servo/servo
Source-Revision: 2fd8cbccdd5dae1ec79404bdf0f582a2f0ff89a4
This commit is contained in:
Jayflux 2016-02-13 23:03:49 +05:01
parent 12fadf10d5
commit faeb869af7
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
servo/python/servo/command_base.py
View File

@ -381,7 +381,8 @@ class CommandBase(object):
env['RUSTDOC'] = path.join(self.context.topdir, 'etc', 'rustdoc-with-private')
if self.config["tools"]["rustc-with-gold"]:
# Don't run the gold linker if on Windows https://github.com/servo/servo/issues/9499
if self.config["tools"]["rustc-with-gold"] and sys.platform not in ("win32", "msys"):
if subprocess.call(['which', 'ld.gold'], stdout=PIPE, stderr=PIPE) == 0:
env['RUSTC'] = path.join(self.context.topdir, 'etc', 'rustc-with-gold')