From ebec1af90a7a2c8d277cc105f6ee19bff5be5958 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thorsten=20Sch=C3=BCtt?= Date: Thu, 3 Jun 2021 15:58:37 +0200 Subject: [PATCH 1/3] linker detection for ld64.lld --- compiler/rustc_codegen_cranelift/src/toolchain.rs | 2 +- compiler/rustc_codegen_ssa/src/back/link.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/compiler/rustc_codegen_cranelift/src/toolchain.rs b/compiler/rustc_codegen_cranelift/src/toolchain.rs index 484a9b699a0aa..9ed6e17c6825e 100644 --- a/compiler/rustc_codegen_cranelift/src/toolchain.rs +++ b/compiler/rustc_codegen_cranelift/src/toolchain.rs @@ -87,7 +87,7 @@ fn linker_and_flavor(sess: &Session) -> (PathBuf, LinkerFlavor) { LinkerFlavor::Ld } else if stem == "link" || stem == "lld-link" { LinkerFlavor::Msvc - } else if stem == "lld" || stem == "rust-lld" { + } else if stem == "lld" || stemp = "ld64.lld" || stem == "rust-lld" { LinkerFlavor::Lld(sess.target.lld_flavor) } else { // fall back to the value in the target spec diff --git a/compiler/rustc_codegen_ssa/src/back/link.rs b/compiler/rustc_codegen_ssa/src/back/link.rs index 32275e9b07348..f943c1d9fdaf7 100644 --- a/compiler/rustc_codegen_ssa/src/back/link.rs +++ b/compiler/rustc_codegen_ssa/src/back/link.rs @@ -1009,7 +1009,7 @@ fn linker_and_flavor(sess: &Session) -> (PathBuf, LinkerFlavor) { LinkerFlavor::Ld } else if stem == "link" || stem == "lld-link" { LinkerFlavor::Msvc - } else if stem == "lld" || stem == "rust-lld" { + } else if stem == "lld" || stemp = "ld64.lld" || stem == "rust-lld" { LinkerFlavor::Lld(sess.target.lld_flavor) } else { // fall back to the value in the target spec From 937e2c8192180cf0aec38dc95e3d323d07370cb2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thorsten=20Sch=C3=BCtt?= Date: Thu, 3 Jun 2021 16:32:32 +0200 Subject: [PATCH 2/3] stemp -> stem --- compiler/rustc_codegen_cranelift/src/toolchain.rs | 2 +- compiler/rustc_codegen_ssa/src/back/link.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/compiler/rustc_codegen_cranelift/src/toolchain.rs b/compiler/rustc_codegen_cranelift/src/toolchain.rs index 9ed6e17c6825e..deae9ee56c7f4 100644 --- a/compiler/rustc_codegen_cranelift/src/toolchain.rs +++ b/compiler/rustc_codegen_cranelift/src/toolchain.rs @@ -87,7 +87,7 @@ fn linker_and_flavor(sess: &Session) -> (PathBuf, LinkerFlavor) { LinkerFlavor::Ld } else if stem == "link" || stem == "lld-link" { LinkerFlavor::Msvc - } else if stem == "lld" || stemp = "ld64.lld" || stem == "rust-lld" { + } else if stem == "lld" || stem = "ld64.lld" || stem == "rust-lld" { LinkerFlavor::Lld(sess.target.lld_flavor) } else { // fall back to the value in the target spec diff --git a/compiler/rustc_codegen_ssa/src/back/link.rs b/compiler/rustc_codegen_ssa/src/back/link.rs index f943c1d9fdaf7..c3f832a8fbce7 100644 --- a/compiler/rustc_codegen_ssa/src/back/link.rs +++ b/compiler/rustc_codegen_ssa/src/back/link.rs @@ -1009,7 +1009,7 @@ fn linker_and_flavor(sess: &Session) -> (PathBuf, LinkerFlavor) { LinkerFlavor::Ld } else if stem == "link" || stem == "lld-link" { LinkerFlavor::Msvc - } else if stem == "lld" || stemp = "ld64.lld" || stem == "rust-lld" { + } else if stem == "lld" || stem = "ld64.lld" || stem == "rust-lld" { LinkerFlavor::Lld(sess.target.lld_flavor) } else { // fall back to the value in the target spec From e77845d2f1f29c1d2de4c1085a6840da9b5e0f8f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thorsten=20Sch=C3=BCtt?= Date: Sat, 5 Jun 2021 07:10:02 +0200 Subject: [PATCH 3/3] fix --- compiler/rustc_codegen_cranelift/src/toolchain.rs | 2 +- compiler/rustc_codegen_ssa/src/back/link.rs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/compiler/rustc_codegen_cranelift/src/toolchain.rs b/compiler/rustc_codegen_cranelift/src/toolchain.rs index deae9ee56c7f4..ec4d7669e395c 100644 --- a/compiler/rustc_codegen_cranelift/src/toolchain.rs +++ b/compiler/rustc_codegen_cranelift/src/toolchain.rs @@ -87,7 +87,7 @@ fn linker_and_flavor(sess: &Session) -> (PathBuf, LinkerFlavor) { LinkerFlavor::Ld } else if stem == "link" || stem == "lld-link" { LinkerFlavor::Msvc - } else if stem == "lld" || stem = "ld64.lld" || stem == "rust-lld" { + } else if stem == "lld" || stem == "ld64.lld" || stem == "rust-lld" { LinkerFlavor::Lld(sess.target.lld_flavor) } else { // fall back to the value in the target spec diff --git a/compiler/rustc_codegen_ssa/src/back/link.rs b/compiler/rustc_codegen_ssa/src/back/link.rs index c3f832a8fbce7..5fb0841d32e6c 100644 --- a/compiler/rustc_codegen_ssa/src/back/link.rs +++ b/compiler/rustc_codegen_ssa/src/back/link.rs @@ -1009,7 +1009,7 @@ fn linker_and_flavor(sess: &Session) -> (PathBuf, LinkerFlavor) { LinkerFlavor::Ld } else if stem == "link" || stem == "lld-link" { LinkerFlavor::Msvc - } else if stem == "lld" || stem = "ld64.lld" || stem == "rust-lld" { + } else if stem == "lld" || stem == "ld64.lld" || stem == "rust-lld" { LinkerFlavor::Lld(sess.target.lld_flavor) } else { // fall back to the value in the target spec