Skip to content

fix: remove "rust-lld" as custom linker on windows #5242

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
alex-ds13 wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: remove "rust-lld" as custom linker on windows #5242

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 14 additions & 0 deletions packages/cli/src/build/request.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -861,6 +861,20 @@ impl BuildRequest {
let mut custom_linker = cargo_config.linker(triple.to_string()).ok().flatten();
let mut rustflags = cargo_config2::Flags::default();

// Remove "rust-lld" as a custom linker on Windows, since that is already the linker we
// default to.
if let Some(linker) = custom_linker.as_ref() {
if (linker == "rust-lld" || linker == "rust-lld.exe") && cfg!(windows) {
// When using "rust-lld.exe" as linker on windows, it still needs to have a flavor
// given to it. rustc appears to be passing `-flavor "link"` when none is set by the
// user. If no flavor is given, it fails with 'lld is a generic driver'.
// We already use the existing lld-link by default on windows, so we can simply set the
// `custom_linker` to `None` in these cases, since we end up using "lld-link" anyway
// which is the same as "rust-lld.exe -flavor link".
custom_linker = None;
}
}

// Make sure to take into account the RUSTFLAGS env var and the CARGO_TARGET_<triple>_RUSTFLAGS
for env in [
"RUSTFLAGS".to_string(),
Expand Down