Skip to content

Commit fcb3ccf

Browse files
authored
Merge pull request #474 from kinke/mingw8
Upgrade MinGW-based libs to MinGW-w64 v8.0.0
2 parents aff9f8d + 7729dca commit fcb3ccf

File tree

4 files changed

+7
-3
lines changed

4 files changed

+7
-3
lines changed

azure-pipelines.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ jobs:
3737
variables:
3838
VSINSTALLDIR: C:\Program Files (x86)\Microsoft Visual Studio\2017\Enterprise\
3939
# NB: update windows/build_mingw.sha256sums as well
40-
MINGW_VER: 7.0.0
40+
MINGW_VER: 8.0.0
4141
D_VERSION: 2.077.1
4242
steps:
4343
- template: .azure-pipelines/build-mingw-libs.yml

windows/build_mingw.bat

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
set ROOT=%CD%
44
mkdir "%ROOT%\artifacts"
55

6-
set TAG=mingw-libs-%MINGW_VER%-3
6+
set TAG=mingw-libs-%MINGW_VER%
77
set ARTIFACT=%TAG%.zip
88
set ARTIFACTPATH=%ROOT%\artifacts\%ARTIFACT%
99
set GITHUB_RELEASE=https://github.com/dlang/installer/releases/download/%TAG%/%ARTIFACT%

windows/build_mingw.sha256sums

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
aa20dfff3596f08a7f427aab74315a6cb80c2b086b4a107ed35af02f9496b628 mingw-w64.tar.bz2
1+
44c740ea6ab3924bc3aa169bad11ad3c5766c5c8459e3126d44eabb8735a5762 mingw-w64.tar.bz2

windows/mingw/buildsdk.d

+4
Original file line numberDiff line numberDiff line change
@@ -164,6 +164,10 @@ void sanitizeDef(string defFile)
164164
if (line == "ExtractIconW@")
165165
return ";ExtractIconW@";
166166

167+
// Apparent bugs in lib32/api-ms-win-*.def - missing stdcall params size suffix.
168+
if (line[$-1] == '@' && baseName(defFile).startsWith("api-ms-win-"))
169+
return ";" ~ line;
170+
167171
return line;
168172
});
169173
}

0 commit comments

Comments
 (0)