diff options
author | bors-servo <infra@servo.org> | 2023-06-24 12:18:26 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-06-24 12:18:26 +0200 |
commit | d30c9f83020c18d49c11c94ab1c4a96c3b7091f7 (patch) | |
tree | 40519f279cf5040cfc909009c958beebd80d25f7 /python/servo | |
parent | 19eeca7b3a79d0bacd0fe31faba89c2cc866dcfe (diff) | |
parent | 0256ac9c620bfff1eb0d962284d125efb79d5305 (diff) | |
download | servo-d30c9f83020c18d49c11c94ab1c4a96c3b7091f7.tar.gz servo-d30c9f83020c18d49c11c94ab1c4a96c3b7091f7.zip |
Auto merge of #29922 - sagudev:patch-6, r=mrobinson
Fix Windows build after #29912
Fixup for https://github.com/servo/servo/pull/29912#issuecomment-1605347271
<!-- Please describe your changes on the following line: -->
---
<!-- Thank you for contributing to Servo! Please replace each `[ ]` by `[X]` when the step is complete, and replace `___` with appropriate data: -->
- [x] `./mach build -d` does not report any errors
- [x] `./mach test-tidy` does not report any errors
- [x] These changes fixup https://github.com/servo/servo/pull/29912
<!-- Either: -->
- [ ] There are tests for these changes OR
- [ ] These changes do not require tests because ___
<!-- Also, please make sure that "Allow edits from maintainers" checkbox is checked, so that we can help you if you get stuck somewhere along the way.-->
<!-- Pull requests that do not address these steps are welcome, but they will require additional verification as part of the review process. -->
Diffstat (limited to 'python/servo')
-rw-r--r-- | python/servo/command_base.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/python/servo/command_base.py b/python/servo/command_base.py index 33c3689b954..ebb96d8866a 100644 --- a/python/servo/command_base.py +++ b/python/servo/command_base.py @@ -629,7 +629,7 @@ class CommandBase(object): env['RUSTFLAGS'] = env.get('RUSTFLAGS', "") + " " + self.config["build"]["rustflags"] if self.config["tools"]["rustc-with-gold"]: - if subprocess.call(['which', 'ld.gold'], stdout=PIPE, stderr=PIPE) == 0: + if shutil.which('ld.gold'): env['RUSTFLAGS'] = env.get('RUSTFLAGS', "") + " -C link-args=-fuse-ld=gold" if not (self.config["build"]["ccache"] == ""): |