Virtualization
/
meson
mirror of https://gitlab.com/qemu-project/meson.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Revert "azure: Workaround MSYS2 PCH test failures" 

This reverts commit 5f9dccb9bc.
This commit is contained in:
Jon Turney 2020-03-16 19:41:03 +00:00 committed by Jussi Pakkanen
parent c557205695
commit 0fa70325ed
1 changed files with 0 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
azure-pipelines.yml
View File

@ -171,20 +171,6 @@ jobs:
%TOOLCHAIN%
%MSYS2_ROOT%\usr\bin\bash -lc "python3 -m pip --disable-pip-version-check install pefile"
displayName: Install Dependencies
- powershell: |
# https://github.com/mesonbuild/meson/issues/5807
# https://github.com/msys2/MINGW-packages/issues/5719#issuecomment-525845769
if ($env:compiler -eq 'gcc') {
(New-Object net.webclient).DownloadFile("https://github.com/mesonbuild/cidata/raw/master/win32/setdllcharacteristics.exe", "$(System.WorkFolder)\setdllcharacteristics.exe")
if ($env:MSYS2_ARCH -eq 'x86_64') {
$(System.WorkFolder)\setdllcharacteristics -d $env:MSYS2_ROOT\mingw64\lib\gcc\x86_64-w64-mingw32\9.2.0\cc1.exe
$(System.WorkFolder)\setdllcharacteristics -d $env:MSYS2_ROOT\mingw64\lib\gcc\x86_64-w64-mingw32\9.2.0\cc1plus.exe
} else {
$(System.WorkFolder)\setdllcharacteristics -d $env:MSYS2_ROOT\mingw32\lib\gcc\i686-w64-mingw32\9.2.0\cc1.exe
$(System.WorkFolder)\setdllcharacteristics -d $env:MSYS2_ROOT\mingw32\lib\gcc\i686-w64-mingw32\9.2.0\cc1plus.exe
}
}
displayName: MSYS2 PCH hack
- script: |
set BOOST_ROOT=
set PATH=%SystemRoot%\system32;%SystemRoot%;%SystemRoot%\System32\Wbem