diff options
| author | bors <bors@rust-lang.org> | 2023-03-20 14:36:49 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2023-03-20 14:36:49 +0000 |
| commit | 8460ca823e8367a30dda430efda790588b8c84d3 (patch) | |
| tree | 1e32b07304207ef4353c452da4bca3cbc7fba53d /compiler/rustc_codegen_ssa/src/back | |
| parent | 2c8cc343237b8f7d5a3c3703e3a87f2eb2c54a74 (diff) | |
| parent | 51bdb0f085d02aeab0adbf4b497afc22d6b26f3f (diff) | |
| download | rust-1.68.1.tar.gz rust-1.68.1.zip | |
Auto merge of #109335 - Mark-Simulacrum:stable-next, r=Mark-Simulacrum 1.68.1
[stable] 1.68.1 release This packages up a set of release notes, version bump, and backports of: * Don't eagerly convert principal to string #108162 * Revert "enable ThinLTO for rustc on x86_64-pc-windows-msvc dist builds" #109094 * Create dirs for build_triple #109111 * Fix linker detection for clang with prefix #109156 * ci: use apt install --download-only for solaris debs #108951 The last of those is not yet stable-accepted but I expect it to be, we will drop it and rebuild artifacts if we don't actually approve it. r? `@Mark-Simulacrum`
Diffstat (limited to 'compiler/rustc_codegen_ssa/src/back')
| -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 b148e4185a6..34e042376c1 100644 --- a/compiler/rustc_codegen_ssa/src/back/link.rs +++ b/compiler/rustc_codegen_ssa/src/back/link.rs @@ -1237,7 +1237,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" @@ -1245,7 +1245,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") { |