diff options
| author | bors-servo <lbergstrom+bors@mozilla.com> | 2016-02-13 23:32:49 +0530 |
|---|---|---|
| committer | bors-servo <lbergstrom+bors@mozilla.com> | 2016-02-13 23:32:49 +0530 |
| commit | 2fd8cbccdd5dae1ec79404bdf0f582a2f0ff89a4 (patch) | |
| tree | 1f64a23d9746e653a58f273bb4be4c03f14b1a04 /python/servo/command_base.py | |
| parent | 80e55c7ce42fae08c6517facab686913c0c4eef8 (diff) | |
| parent | 45c9521dc93bb6d5bf49d3c7fb06ddab52e70950 (diff) | |
| download | servo-2fd8cbccdd5dae1ec79404bdf0f582a2f0ff89a4.tar.gz servo-2fd8cbccdd5dae1ec79404bdf0f582a2f0ff89a4.zip | |
Auto merge of #9588 - Jayflux:hotfix/9499, r=Wafflespeanut
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 -->
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 ece5e134141..7786d1d5a34 100644 --- a/python/servo/command_base.py +++ b/python/servo/command_base.py @@ -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') |