up

rust-lang · Jun 2, 2024 · 07b1684 · 07b1684
1 parent 88d116a
commit 07b1684
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 24 deletions.
diff --git a/.cargo/config.toml b/.cargo/config.toml
@@ -2,9 +2,7 @@
 dev-install = "run -- --no-modify-path -y"
 
 [target.x86_64-pc-windows-gnu]
-linker = "ld.lld.exe"
-rustflags = ["-C", "link-self-contained=no", "-C", "link-arg=-fuse-ld=lld"]
+rustflags = ["-C", "link-arg=-fuse-ld=lld"]
 
 [target.i686-pc-windows-gnu]
-linker = "ld.lld.exe"
-rustflags = ["-C", "link-self-contained=no", "-C", "link-arg=-fuse-ld=lld"]
+rustflags = ["-C", "link-arg=-fuse-ld=lld"]
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -55,11 +55,6 @@ jobs:
           New-Item "${env:USERPROFILE}\.cargo\registry" -ItemType Directory -Force
           New-Item "${env:USERPROFILE}\.cargo\git" -ItemType Directory -Force
         shell: powershell
-      - name: Install mingw
-        shell: powershell
-        if: matrix.mingwdir != ''
-        run: |
-          choco install mingw -y --no-progress
       - name: Set PATH
         run: |
           echo "%USERPROFILE%\.cargo\bin" | Out-File -Append -FilePath $env:GITHUB_PATH -Encoding utf8
@@ -189,11 +184,6 @@ jobs:
           New-Item "${env:USERPROFILE}\.cargo\registry" -ItemType Directory -Force
           New-Item "${env:USERPROFILE}\.cargo\git" -ItemType Directory -Force
         shell: powershell
-      - name: Install mingw
-        shell: powershell
-        if: matrix.mingwdir != ''
-        run: |
-          choco install mingw -y --no-progress
       - name: Set PATH
         run: |
           echo "%USERPROFILE%\.cargo\bin" | Out-File -Append -FilePath $env:GITHUB_PATH -Encoding utf8
@@ -327,11 +317,6 @@ jobs:
           New-Item "${env:USERPROFILE}\.cargo\registry" -ItemType Directory -Force
           New-Item "${env:USERPROFILE}\.cargo\git" -ItemType Directory -Force
         shell: powershell
-      - name: Install mingw
-        shell: powershell
-        if: matrix.mingwdir != ''
-        run: |
-          choco install mingw -y --no-progress
       - name: Set PATH
         run: |
           echo "%USERPROFILE%\.cargo\bin" | Out-File -Append -FilePath $env:GITHUB_PATH -Encoding utf8

diff --git a/ci/actions-templates/windows-builds-template.yaml b/ci/actions-templates/windows-builds-template.yaml
@@ -47,11 +47,6 @@ jobs: # skip-master skip-pr skip-stable
           New-Item "${env:USERPROFILE}\.cargo\registry" -ItemType Directory -Force
           New-Item "${env:USERPROFILE}\.cargo\git" -ItemType Directory -Force
         shell: powershell
-      - name: Install mingw
-        shell: powershell
-        if: matrix.mingwdir != ''
-        run: |
-          choco install mingw -y --no-progress
       - name: Set PATH
         run: |
           echo "%USERPROFILE%\.cargo\bin" | Out-File -Append -FilePath $env:GITHUB_PATH -Encoding utf8