eliott/servo
1
0
Fork 0
mirror of https://github.com/servo/servo synced 2026-05-14 10:56:44 +02:00
Code Issues Packages Projects Releases Wiki Activity

Auto merge of #9588 - Jayflux:hotfix/9499, r=Wafflespeanut

Browse Source 
add check for win32 or msys before running rustc-with-gold fixes #9499

<!-- Reviewable:start -->
[<img src="https://reviewable.io/review_button.svg" height="40" alt="Review on Reviewable"/>](https://reviewable.io/reviews/servo/servo/9588)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo
2016-02-13 23:32:49 +05:30
parent 80e55c7ce4 45c9521dc9
commit 2fd8cbccdd
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
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')