From 88d116acba76b32f958cb9ad11f014694a2c21d5 Mon Sep 17 00:00:00 2001
From: rami3l <rami3l@outlook.com>
Date: Sun, 2 Jun 2024 22:51:09 +0800
Subject: [PATCH] Revert 1 commits

edeb0af 'fixup! build(windows/gnu): use `lld` as the default linker'
---
 .cargo/config.toml                                |  8 ++++----
 .github/workflows/ci.yaml                         | 12 ------------
 ci/actions-templates/windows-builds-template.yaml |  4 ----
 3 files changed, 4 insertions(+), 20 deletions(-)

diff --git a/.cargo/config.toml b/.cargo/config.toml
index 42972495b36..a50118a61eb 100644
--- a/.cargo/config.toml
+++ b/.cargo/config.toml
@@ -2,9 +2,9 @@
 dev-install = "run -- --no-modify-path -y"
 
 [target.x86_64-pc-windows-gnu]
-linker = "rust-lld.exe"
-rustflags = ["-C", "link-self-contained=no"]
+linker = "ld.lld.exe"
+rustflags = ["-C", "link-self-contained=no", "-C", "link-arg=-fuse-ld=lld"]
 
 [target.i686-pc-windows-gnu]
-linker = "rust-lld.exe"
-rustflags = ["-C", "link-self-contained=no"]
+linker = "ld.lld.exe"
+rustflags = ["-C", "link-self-contained=no", "-C", "link-arg=-fuse-ld=lld"]
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index a980210d72f..9dddbba189a 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -98,10 +98,6 @@ jobs:
       - name: Ensure stable toolchain is up to date
         run: rustup update stable
         shell: bash
-      - name: Install `llvm-tools`
-        if: matrix.mingwdir != ''
-        run: |
-          rustup component add llvm-tools-preview
       - name: Install the target
         run: |
           rustup target install ${{ matrix.target }}
@@ -236,10 +232,6 @@ jobs:
       - name: Ensure stable toolchain is up to date
         run: rustup update stable
         shell: bash
-      - name: Install `llvm-tools`
-        if: matrix.mingwdir != ''
-        run: |
-          rustup component add llvm-tools-preview
       - name: Install the target
         run: |
           rustup target install ${{ matrix.target }}
@@ -378,10 +370,6 @@ jobs:
       - name: Ensure stable toolchain is up to date
         run: rustup update stable
         shell: bash
-      - name: Install `llvm-tools`
-        if: matrix.mingwdir != ''
-        run: |
-          rustup component add llvm-tools-preview
       - name: Install the target
         run: |
           rustup target install ${{ matrix.target }}
diff --git a/ci/actions-templates/windows-builds-template.yaml b/ci/actions-templates/windows-builds-template.yaml
index 2d533c5c484..abd5e3a89fe 100644
--- a/ci/actions-templates/windows-builds-template.yaml
+++ b/ci/actions-templates/windows-builds-template.yaml
@@ -90,10 +90,6 @@ jobs: # skip-master skip-pr skip-stable
       - name: Ensure stable toolchain is up to date
         run: rustup update stable
         shell: bash
-      - name: Install `llvm-tools`
-        if: matrix.mingwdir != ''
-        run: |
-          rustup component add llvm-tools-preview
       - name: Install the target
         run: |
           rustup target install ${{ matrix.target }}