@@ -35,13 +35,13 @@ environment:
35
35
RUST_CONFIGURE_ARGS : --build=i686-pc-windows-gnu --enable-ninja
36
36
SCRIPT : python x.py test
37
37
MINGW_URL : https://s3.amazonaws.com/rust-lang-ci/rust-ci-mirror
38
- MINGW_ARCHIVE : i686-6.2 .0-release-posix-dwarf-rt_v5-rev1 .7z
38
+ MINGW_ARCHIVE : i686-6.3 .0-release-posix-dwarf-rt_v5-rev2 .7z
39
39
MINGW_DIR : mingw32
40
40
- MSYS_BITS : 64
41
41
SCRIPT : python x.py test
42
42
RUST_CONFIGURE_ARGS : --build=x86_64-pc-windows-gnu --enable-ninja
43
43
MINGW_URL : https://s3.amazonaws.com/rust-lang-ci/rust-ci-mirror
44
- MINGW_ARCHIVE : x86_64-6.2 .0-release-posix-seh-rt_v5-rev1 .7z
44
+ MINGW_ARCHIVE : x86_64-6.3 .0-release-posix-seh-rt_v5-rev2 .7z
45
45
MINGW_DIR : mingw64
46
46
47
47
# 32/64 bit MSVC and GNU deployment
@@ -60,14 +60,14 @@ environment:
60
60
RUST_CONFIGURE_ARGS : --build=i686-pc-windows-gnu --enable-extended --enable-ninja
61
61
SCRIPT : python x.py dist
62
62
MINGW_URL : https://s3.amazonaws.com/rust-lang-ci/rust-ci-mirror
63
- MINGW_ARCHIVE : i686-6.2 .0-release-posix-dwarf-rt_v5-rev1 .7z
63
+ MINGW_ARCHIVE : i686-6.3 .0-release-posix-dwarf-rt_v5-rev2 .7z
64
64
MINGW_DIR : mingw32
65
65
DEPLOY : 1
66
66
- MSYS_BITS : 64
67
67
SCRIPT : python x.py dist
68
68
RUST_CONFIGURE_ARGS : --build=x86_64-pc-windows-gnu --enable-extended --enable-ninja
69
69
MINGW_URL : https://s3.amazonaws.com/rust-lang-ci/rust-ci-mirror
70
- MINGW_ARCHIVE : x86_64-6.2 .0-release-posix-seh-rt_v5-rev1 .7z
70
+ MINGW_ARCHIVE : x86_64-6.3 .0-release-posix-seh-rt_v5-rev2 .7z
71
71
MINGW_DIR : mingw64
72
72
DEPLOY : 1
73
73
@@ -96,6 +96,26 @@ install:
96
96
- if defined MINGW_URL 7z x -y %MINGW_ARCHIVE% > nul
97
97
- if defined MINGW_URL set PATH=%CD%\%MINGW_DIR%\bin;C:\msys64\usr\bin;%PATH%
98
98
99
+ # Here we do a pretty heinous thing which is to mangle the MinGW installation
100
+ # we just had above. Currently, as of this writing, we're using MinGW-w64
101
+ # builds of gcc, and that's currently at 6.3.0. We use 6.3.0 as it appears to
102
+ # be the first version which contains a fix for #40546, builds randomly
103
+ # failing during LLVM due to ar.exe/ranlib.exe failures.
104
+ #
105
+ # Unfortunately, though, 6.3.0 *also* is the first version of MinGW-w64 builds
106
+ # to contain a regression in gdb (#40184). As a result if we were to use the
107
+ # gdb provided (7.11.1) then we would fail all debuginfo tests.
108
+ #
109
+ # In order to fix spurious failures (pretty high priority) we use 6.3.0. To
110
+ # avoid disabling gdb tests we download an *old* version of gdb, specifically
111
+ # that found inside the 6.2.0 distribution. We then overwrite the 6.3.0 gdb
112
+ # with the 6.2.0 gdb to get tests passing.
113
+ #
114
+ # Note that we don't literally overwrite the gdb.exe binary because it appears
115
+ # to just use gdborig.exe, so that's the binary we deal with instead.
116
+ - if defined MINGW_URL appveyor-retry appveyor DownloadFile %MINGW_URL%/2017-04-20-%MSYS_BITS%bit-gdborig.exe
117
+ - if defined MINGW_URL mv 2017-04-20-%MSYS_BITS%bit-gdborig.exe %MINGW_DIR%\bin\gdborig.exe
118
+
99
119
# Otherwise pull in the MinGW installed on appveyor
100
120
- if NOT defined MINGW_URL set PATH=C:\msys64\mingw%MSYS_BITS%\bin;C:\msys64\usr\bin;%PATH%
101
121
0 commit comments