diff options
| author | Taiki Endo <te316e89@gmail.com> | 2023-03-15 13:30:45 +0900 |
|---|---|---|
| committer | Taiki Endo <te316e89@gmail.com> | 2023-03-15 13:30:45 +0900 |
| commit | 86a5e3632c77d1c77d58ddb750a147998b5e4dbd (patch) | |
| tree | e6a6a7544476a592bf971288d7c5c374f941775d | |
| parent | 1716932743a7b3705cbf0c34db0c4e070ed1930d (diff) | |
| download | rust-86a5e3632c77d1c77d58ddb750a147998b5e4dbd.tar.gz rust-86a5e3632c77d1c77d58ddb750a147998b5e4dbd.zip | |
Fix linker detection for clang with prefix
| -rw-r--r-- | compiler/rustc_codegen_ssa/src/back/link.rs | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/compiler/rustc_codegen_ssa/src/back/link.rs b/compiler/rustc_codegen_ssa/src/back/link.rs index 8aa744ce935..8bb143ed3da 100644 --- a/compiler/rustc_codegen_ssa/src/back/link.rs +++ b/compiler/rustc_codegen_ssa/src/back/link.rs @@ -1199,7 +1199,7 @@ pub fn linker_and_flavor(sess: &Session) -> (PathBuf, LinkerFlavor) { .and_then(|(lhs, rhs)| rhs.chars().all(char::is_numeric).then_some(lhs)) .unwrap_or(stem); - // GCC can have an optional target prefix. + // GCC/Clang can have an optional target prefix. let flavor = if stem == "emcc" { LinkerFlavor::EmCc } else if stem == "gcc" @@ -1207,7 +1207,9 @@ pub fn linker_and_flavor(sess: &Session) -> (PathBuf, LinkerFlavor) { || stem == "g++" || stem.ends_with("-g++") || stem == "clang" + || stem.ends_with("-clang") || stem == "clang++" + || stem.ends_with("-clang++") { LinkerFlavor::from_cli(LinkerFlavorCli::Gcc, &sess.target) } else if stem == "wasm-ld" || stem.ends_with("-wasm-ld") { |