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

This commit is contained in:
Jayflux 2016-02-09 23:13:09 +00:00 committed by Jason Williams
parent 088963f774
commit 45c9521dc9

View file

@ -379,7 +379,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')