mirror of
https://github.com/servo/servo.git
synced 2025-06-06 16:45:39 +00:00
Auto merge of #29912 - mrobinson:try-gold-on-windows, r=jdm
Don't explicitly disable gold on Windows This seems to be working fine now on CI, so I think we can remove this workaround. <!-- 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 do not require tests because they are just build changes. <!-- 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. -->
This commit is contained in:
commit
edeed11cef
1 changed files with 1 additions and 2 deletions
|
@ -628,8 +628,7 @@ class CommandBase(object):
|
|||
if self.config["build"]["rustflags"]:
|
||||
env['RUSTFLAGS'] = env.get('RUSTFLAGS', "") + " " + self.config["build"]["rustflags"]
|
||||
|
||||
# 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 != "win32":
|
||||
if self.config["tools"]["rustc-with-gold"]:
|
||||
if subprocess.call(['which', 'ld.gold'], stdout=PIPE, stderr=PIPE) == 0:
|
||||
env['RUSTFLAGS'] = env.get('RUSTFLAGS', "") + " -C link-args=-fuse-ld=gold"
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue