Skip to content

toolchain: avoid broad substring replacement in get_toolchain_binary #1637

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

Closed
AayushMainali-Github wants to merge 1 commit into from
+14 −10
Closed

toolchain: avoid broad substring replacement in get_toolchain_binary #1637

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
24 changes: 14 additions & 10 deletions src/toolchain.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,18 +11,22 @@ pub(crate) fn get_toolchain_binary(sess: &Session, tool: &str) -> PathBuf {
let linker_file_name =
linker.file_name().unwrap().to_str().expect("linker filename should be valid UTF-8");

if linker_file_name == "ld.lld" {
if tool != "ld" {
linker.set_file_name(tool)
}
let tool_file_name = if linker_file_name == "ld.lld" {
if tool == "ld" { "ld.lld".to_owned() } else { tool.to_owned() }
} else if let Some(prefix) = linker_file_name.strip_suffix("gcc") {
format!("{prefix}{tool}")
} else if let Some(prefix) = linker_file_name.strip_suffix("clang") {
format!("{prefix}{tool}")
} else if let Some(prefix) = linker_file_name.strip_suffix("cc") {
format!("{prefix}{tool}")
} else if let Some(prefix) = linker_file_name.strip_suffix("ld") {
format!("{prefix}{tool}")
} else {
let tool_file_name = linker_file_name
.replace("ld", tool)
.replace("gcc", tool)
.replace("clang", tool)
.replace("cc", tool);
linker_file_name.to_owned()
};

linker.set_file_name(tool_file_name)
if tool_file_name != linker_file_name {
linker.set_file_name(tool_file_name);
}

linker
Expand Down
Loading