From 45c9521dc93bb6d5bf49d3c7fb06ddab52e70950 Mon Sep 17 00:00:00 2001 From: Jayflux Date: Tue, 9 Feb 2016 23:13:09 +0000 Subject: [PATCH] add check for win32 or msys before running rustc-with-gold fixes #9499 --- python/servo/command_base.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/python/servo/command_base.py b/python/servo/command_base.py index d43c3ab4eda..39b5f351635 100644 --- a/python/servo/command_base.py +++ b/python/servo/command_base.py @@ -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')