diff options
| author | Jubilee <workingjubilee@gmail.com> | 2024-09-09 00:17:46 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-09-09 00:17:46 -0700 |
| commit | 1ea466bdcefaacf00c576aeedf1148fdc6fc3252 (patch) | |
| tree | 30b5a170bce418f0be246d068fb457fe092c3102 | |
| parent | 085744b7ad8b227239bcee0a44cd78dcd0310ab9 (diff) | |
| parent | 4ee58db2f10d370f8e7ccc4b1409440342f01c3e (diff) | |
Rollup merge of #119229 - mati865:update-mingw-toolchain, r=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: https://github.com/rust-lang/rust/issues/112368
| -rwxr-xr-x | src/ci/scripts/install-mingw.sh | 4 | ||||
| -rw-r--r-- | tests/debuginfo/by-value-non-immediate-argument.rs | 1 | ||||
| -rw-r--r-- | tests/debuginfo/method-on-enum.rs | 2 |
3 files changed, 5 insertions, 2 deletions
diff --git a/src/ci/scripts/install-mingw.sh b/src/ci/scripts/install-mingw.sh index 31aa3785bc3..91eab2e7a08 100755 --- a/src/ci/scripts/install-mingw.sh +++ b/src/ci/scripts/install-mingw.sh @@ -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 diff --git a/tests/debuginfo/by-value-non-immediate-argument.rs b/tests/debuginfo/by-value-non-immediate-argument.rs index f0a39a45195..192f6efe7db 100644 --- a/tests/debuginfo/by-value-non-immediate-argument.rs +++ b/tests/debuginfo/by-value-non-immediate-argument.rs @@ -1,6 +1,7 @@ //@ min-lldb-version: 1800 //@ min-gdb-version: 13.0 //@ compile-flags:-g +//@ ignore-windows-gnu: #128973 // === GDB TESTS =================================================================================== diff --git a/tests/debuginfo/method-on-enum.rs b/tests/debuginfo/method-on-enum.rs index a570144450d..754b4a2dc26 100644 --- a/tests/debuginfo/method-on-enum.rs +++ b/tests/debuginfo/method-on-enum.rs @@ -3,6 +3,8 @@ //@ compile-flags:-g +//@ ignore-windows-gnu: #128973 + // === GDB TESTS =================================================================================== // gdb-command:run |