Skip to content

Commit 714697e

Browse files
Auto merge of #148869 - mati865:windows-gnu-update-toolchain, r=<try>
windows-gnu: update C toolchain try-job: dist-i686-mingw try-job: x86_64-mingw-1 try-job: x86_64-mingw-2 try-job: dist-x86_64-mingw
2 parents 2fcbda6 + d4824b9 commit 714697e

File tree

2 files changed

+4
-11
lines changed

2 files changed

+4
-11
lines changed

src/ci/run.sh

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -73,14 +73,6 @@ RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --set rust.codegen-units-std=1"
7373
# of our CPU resources.
7474
RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --set dist.compression-profile=balanced"
7575

76-
# When building for mingw, limit the number of parallel linker jobs during
77-
# the LLVM build, as not to run out of memory.
78-
# This is an attempt to fix the spurious build error tracked by
79-
# https://github.com/rust-lang/rust/issues/108227.
80-
if isKnownToBeMingwBuild; then
81-
RUST_CONFIGURE_ARGS="$RUST_CONFIGURE_ARGS --set llvm.link-jobs=1"
82-
fi
83-
8476
# Only produce xz tarballs on CI. gz tarballs will be generated by the release
8577
# process by recompressing the existing xz ones. This decreases the storage
8678
# space required for CI artifacts.

src/ci/scripts/install-mingw.sh

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,9 @@ IFS=$'\n\t'
66

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

9-
MINGW_ARCHIVE_32="i686-14.1.0-release-posix-dwarf-msvcrt-rt_v12-rev0.7z"
10-
MINGW_ARCHIVE_64="x86_64-14.1.0-release-posix-seh-msvcrt-rt_v12-rev0.7z"
9+
MINGW_ARCHIVE_32="i686-14.2.0-release-posix-dwarf-msvcrt-rt_v12-rev2.7z"
10+
MINGW_ARCHIVE_64="x86_64-14.2.0-release-posix-seh-msvcrt-rt_v12-rev2.7z"
11+
TMP_URL="https://github.com/niXman/mingw-builds-binaries/releases/download/14.2.0-rt_v12-rev2/"
1112

1213
if isWindows && isKnownToBeMingwBuild; then
1314
case "${CI_JOB_NAME}" in
@@ -40,7 +41,7 @@ if isWindows && isKnownToBeMingwBuild; then
4041

4142
mingw_dir="mingw${bits}"
4243

43-
curl -o mingw.7z "${MIRRORS_BASE}/${mingw_archive}"
44+
curl -o mingw.7z "${TMP_URL}/${mingw_archive}"
4445
7z x -y mingw.7z > /dev/null
4546
ciCommandAddPath "$(cygpath -m "$(pwd)/${mingw_dir}/bin")"
4647

0 commit comments

Comments
 (0)