lili/qt5
1
0
Fork 0
mirror of git://code.qt.io/qt/qt5.git synced 2026-02-02 22:45:23 +08:00
Code Issues Packages Projects Releases Wiki Activity

Update llvm-mingw to version 13.0.0

Browse Source 
When Windows 10 and 11 were updated, this was missing

Task-number: QTQAINFRA-4593
Change-Id: I52c920a5fc791db2039469f2931fa6c941f67e1e
Reviewed-by: Oliver Wolff <oliver.wolff@qt.io>
Reviewed-by: Ville-Pekka Karhu <ville-pekka.karhu@qt.io>
This commit is contained in:
Tony Sarajärvi
2022-02-10 08:15:07 +02:00
parent 6c0950edf8
commit 82ecf74768
2 changed files with 12 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
coin/provisioning/qtci-windows-10_21H2-x86_64/25-llvm-mingw.ps1
View File

@@ -41,21 +41,15 @@
# This script installs LLVM-Mingw by mstorsjo
$zip = Get-DownloadLocation "llvm-mingw-20210423-ucrt-x86_64.zip"
$url_cache = "http://ci-files01-hki.intra.qt.io/input/windows/llvm-mingw-20210423-ucrt-x86_64.zip"
$url_official = "https://github.com/mstorsjo/llvm-mingw/releases/download/20210423/llvm-mingw-20210423-ucrt-x86_64.zip"
$zip = Get-DownloadLocation "llvm-mingw-20211002-ucrt-x86_64.zip"
$url_cache = "http://ci-files01-hki.intra.qt.io/input/windows/llvm-mingw-20211002-ucrt-x86_64.zip"
$url_official = "https://github.com/mstorsjo/llvm-mingw/releases/download/20211002/llvm-mingw-20211002-ucrt-x86_64.zip"
Download $url_official $url_cache $zip
Verify-Checksum $zip "da9fb1e4a74747b6c410240cec0d488e428fd338"
Verify-Checksum $zip "69907fa281552f795f28438ab69f8c7032c8d20e"
Extract-7Zip $zip C:\
Rename-Item C:\llvm-mingw-20210423-ucrt-x86_64 C:\llvm-mingw
Rename-Item C:\llvm-mingw-20211002-ucrt-x86_64 C:\llvm-mingw
# Due to https://github.com/mstorsjo/llvm-mingw/issues/199
Remove-Item C:\llvm-mingw\aarch64-w64-mingw32\lib\libc++.dll.a
Remove-Item C:\llvm-mingw\x86_64-w64-mingw32\lib\libc++.dll.a
Remove-Item C:\llvm-mingw\armv7-w64-mingw32\lib\libc++.dll.a
Remove-Item C:\llvm-mingw\i686-w64-mingw32\lib\libc++.dll.a
Write-Output "llvm-mingw = 12" >> ~/versions.txt
Write-Output "llvm-mingw = 13.0.0" >> ~/versions.txt
Remove-Item -Path $zip

18
coin/provisioning/qtci-windows-11_21H2-x86_64/25-llvm-mingw.ps1
View File

@@ -41,21 +41,15 @@
# This script installs LLVM-Mingw by mstorsjo
$zip = Get-DownloadLocation "llvm-mingw-20210423-ucrt-x86_64.zip"
$url_cache = "http://ci-files01-hki.intra.qt.io/input/windows/llvm-mingw-20210423-ucrt-x86_64.zip"
$url_official = "https://github.com/mstorsjo/llvm-mingw/releases/download/20210423/llvm-mingw-20210423-ucrt-x86_64.zip"
$zip = Get-DownloadLocation "llvm-mingw-20211002-ucrt-x86_64.zip"
$url_cache = "http://ci-files01-hki.intra.qt.io/input/windows/llvm-mingw-20211002-ucrt-x86_64.zip"
$url_official = "https://github.com/mstorsjo/llvm-mingw/releases/download/20211002/llvm-mingw-20211002-ucrt-x86_64.zip"
Download $url_official $url_cache $zip
Verify-Checksum $zip "da9fb1e4a74747b6c410240cec0d488e428fd338"
Verify-Checksum $zip "69907fa281552f795f28438ab69f8c7032c8d20e"
Extract-7Zip $zip C:\
Rename-Item C:\llvm-mingw-20210423-ucrt-x86_64 C:\llvm-mingw
Rename-Item C:\llvm-mingw-20211002-ucrt-x86_64 C:\llvm-mingw
# Due to https://github.com/mstorsjo/llvm-mingw/issues/199
Remove-Item C:\llvm-mingw\aarch64-w64-mingw32\lib\libc++.dll.a
Remove-Item C:\llvm-mingw\x86_64-w64-mingw32\lib\libc++.dll.a
Remove-Item C:\llvm-mingw\armv7-w64-mingw32\lib\libc++.dll.a
Remove-Item C:\llvm-mingw\i686-w64-mingw32\lib\libc++.dll.a
Write-Output "llvm-mingw = 12" >> ~/versions.txt
Write-Output "llvm-mingw = 13.0.0" >> ~/versions.txt
Remove-Item -Path $zip