Skip to content

Commit

Permalink
Rollup merge of rust-lang#119229 - mati865:update-mingw-toolchain, r=…
Browse files Browse the repository at this point in the history
…jieyouxu,petrochenkov

Update mingw-w64 + GNU toolchain

The list of packaged tools and their versions is available at: https://github.com/niXman/mingw-builds-binaries/releases/tag/14.1.0-rt_v12-rev0

Fixes: rust-lang#112368
  • Loading branch information
workingjubilee committed Sep 9, 2024
2 parents 085744b + 4ee58db commit 500b42c
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 2 deletions.
4 changes: 2 additions & 2 deletions src/ci/scripts/install-mingw.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ IFS=$'\n\t'

source "$(cd "$(dirname "$0")" && pwd)/../shared.sh"

MINGW_ARCHIVE_32="i686-12.2.0-release-posix-dwarf-rt_v10-rev0.7z"
MINGW_ARCHIVE_64="x86_64-12.2.0-release-posix-seh-rt_v10-rev0.7z"
MINGW_ARCHIVE_32="i686-14.1.0-release-posix-dwarf-msvcrt-rt_v12-rev0.7z"
MINGW_ARCHIVE_64="x86_64-14.1.0-release-posix-seh-msvcrt-rt_v12-rev0.7z"

if isWindows && isKnownToBeMingwBuild; then
case "${CI_JOB_NAME}" in
Expand Down
1 change: 1 addition & 0 deletions tests/debuginfo/by-value-non-immediate-argument.rs
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
//@ min-lldb-version: 1800
//@ min-gdb-version: 13.0
//@ compile-flags:-g
//@ ignore-windows-gnu: #128973

// === GDB TESTS ===================================================================================

Expand Down
2 changes: 2 additions & 0 deletions tests/debuginfo/method-on-enum.rs
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,8 @@

//@ compile-flags:-g

//@ ignore-windows-gnu: #128973

// === GDB TESTS ===================================================================================

// gdb-command:run
Expand Down

0 comments on commit 500b42c

Please sign in to comment.