diff options
| author | Jayflux <jase.williams@gmail.com> | 2016-02-09 23:13:09 +0000 |
|---|---|---|
| committer | Jason Williams <jase.williams@gmail.com> | 2016-02-13 13:05:15 +0000 |
| commit | 45c9521dc93bb6d5bf49d3c7fb06ddab52e70950 (patch) | |
| tree | d4c4222165c36753c3846f3f568f914689afc414 /python/servo/command_base.py | |
| parent | 088963f774f5068ec8dc0f3bd88579bc1e84c18d (diff) | |
| download | servo-45c9521dc93bb6d5bf49d3c7fb06ddab52e70950.tar.gz servo-45c9521dc93bb6d5bf49d3c7fb06ddab52e70950.zip | |
add check for win32 or msys before running rustc-with-gold fixes #9499
Diffstat (limited to 'python/servo/command_base.py')
| -rw-r--r-- | python/servo/command_base.py | 3 |
1 files changed, 2 insertions, 1 deletions
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') |