Skip to content

Commit

Permalink
add check for win32 or msys before running rustc-with-gold fixes #9499
Browse files Browse the repository at this point in the history
  • Loading branch information
jasonwilliams committed Feb 13, 2016
1 parent 088963f commit 45c9521
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion python/servo/command_base.py
Expand Up @@ -379,7 +379,8 @@ def build_env(self, gonk=False, hosts_file_path=None):

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

Expand Down

0 comments on commit 45c9521

Please sign in to comment.