Revert 1 commits

edeb0af 'fixup! build(windows/gnu): use `lld` as the default linker'
rust-lang · Jun 2, 2024 · 88d116a · 88d116a
1 parent edeb0af
commit 88d116a
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 20 deletions.
diff --git 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
@@ -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
@@ -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 }}