From fc1117d0e4b70544ab3ffe021651cd848c81628e Mon Sep 17 00:00:00 2001
From: Jiahao XU <Jiahao_XU@outlook.com>
Date: Tue, 18 Jun 2024 21:58:51 +1000
Subject: [PATCH] Disable use of lld (#1782)
* Update justfile to use lld on macOS and Linux
When cargo-zigbuild is not used
Signed-off-by: Jiahao XU <Jiahao_XU@outlook.com>
* Delete .cargo/config.toml
Signed-off-by: Jiahao XU <Jiahao_XU@outlook.com>
* Update justfile to use lld as long as cargo-zigbuild isn't used
Signed-off-by: Jiahao XU <Jiahao_XU@outlook.com>
* Disable lld again
Signed-off-by: Jiahao XU <Jiahao_XU@outlook.com>
---------
Signed-off-by: Jiahao XU <Jiahao_XU@outlook.com>
---
.cargo/config.toml | 16 ----------------
justfile | 4 +---
2 files changed, 1 insertion(+), 19 deletions(-)
delete mode 100644 .cargo/config.toml
diff --git a/.cargo/config.toml b/.cargo/config.toml
deleted file mode 100644
index 65dd5780..00000000
--- a/.cargo/config.toml
+++ /dev/null
@@ -1,16 +0,0 @@
-[target.x86_64-pc-windows-msvc]
-rustflags = ["-C", "link-arg=-fuse-ld=lld"]
-[target.x86_64-pc-windows-gnu]
-rustflags = ["-C", "link-arg=-fuse-ld=lld"]
-
-[target.aarch64-pc-windows-msvc]
-rustflags = ["-C", "link-arg=-fuse-ld=lld"]
-[target.aarch64-pc-windows-gnu]
-rustflags = ["-C", "link-arg=-fuse-ld=lld"]
-
-[target.x86_64-apple-darwin]
-rustflags = ["-C", "link-arg=-fuse-ld=lld"]
-[target.x86_64h-apple-darwin]
-rustflags = ["-C", "link-arg=-fuse-ld=lld"]
-[target.aarch64-apple-darwin]
-rustflags = ["-C", "link-arg=-fuse-ld=lld"]
diff --git a/justfile b/justfile
index 97e0201e..aa60dfd0 100644
--- a/justfile
+++ b/justfile
@@ -133,10 +133,8 @@ rustc-miropt := "" # if for-release != "" { " -Z mir-opt-level=4" } else { "" }
# This option is disabled on windows since it not supported.
rust-lld := "" #if use-cargo-zigbuild != "" {
#""
-#} else if target-os != "windows" {
-#" -Z gcc-ld=lld"
#} else {
-#""
+#" -C link-arg=-fuse-ld=lld"
#}
# ICF: link-time identical code folding