diff options
| author | Jon Turney <jon.turney@dronecode.org.uk> | 2020-03-16 19:41:03 +0000 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2020-03-17 00:12:34 +0200 |
| commit | 0fa70325ed479cc4d61755dd376a8b7ce5a12db0 (patch) | |
| tree | 394ee1eb698af4057acec41d8c4850fcdc45f325 /azure-pipelines.yml | |
| parent | c5572056953e75fbbf03973ee207a4556449edca (diff) | |
| download | meson-0fa70325ed479cc4d61755dd376a8b7ce5a12db0.tar.gz | |
Revert "azure: Workaround MSYS2 PCH test failures"
This reverts commit 5f9dccb9bce957979efa6efea961192a12f76790.
Diffstat (limited to 'azure-pipelines.yml')
| -rw-r--r-- | azure-pipelines.yml | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/azure-pipelines.yml b/azure-pipelines.yml index e7f8e49cf..ad0b6ae89 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -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 |