diff options
| author | Jon Turney <jon.turney@dronecode.org.uk> | 2019-04-11 18:12:11 +0100 |
|---|---|---|
| committer | Jon Turney <jon.turney@dronecode.org.uk> | 2019-04-15 12:07:17 +0100 |
| commit | df0be82dd6581d02d2e5a6d706a26113b35b98d5 (patch) | |
| tree | 03105361c99149401da9a9897b43061151ff0470 | |
| parent | 10749494c81d78b74421e8ed238339b1d067a0b6 (diff) | |
| download | meson-df0be82dd6581d02d2e5a6d706a26113b35b98d5.zip meson-df0be82dd6581d02d2e5a6d706a26113b35b98d5.tar.gz meson-df0be82dd6581d02d2e5a6d706a26113b35b98d5.tar.bz2 | |
azure: Fix some places where an unexpected compiler is being picked up
Now we have some information in CI logs about what compiler is actually
being used, fix some places where an unexpected compiler is being picked
up.
Avoid picking up gcc-objc and gfortran from PATH in vs2017 image for VS
test runs.
Use clang for objc/objc++ in MSYS2 clang test runs, rather than picking
up gcc from path.
Also install gfortran for fortran tests on Cygwin.
| -rw-r--r-- | azure-pipelines.yml | 3 | ||||
| -rw-r--r-- | ci/azure-steps.yml | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 483f1eb..d408762 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -73,6 +73,7 @@ jobs: - script: | %CYGWIN_ROOT%\cygwinsetup.exe -qnNdO -R "%CYGWIN_ROOT%" -s "%CYGWIN_MIRROR%" -g -P ^ cmake,^ + gcc-fortran,^ gcc-objc++,^ gcc-objc,^ git,^ @@ -154,7 +155,7 @@ jobs: set BOOST_ROOT= set PATH=%SystemRoot%\system32;%SystemRoot%;%SystemRoot%\System32\Wbem set PATHEXT=%PATHEXT%;.py - if %compiler%==clang ( set CC=clang && set CXX=clang++ ) + if %compiler%==clang ( set CC=clang && set CXX=clang++ && set OBJC=clang && set OBJCXX=clang++ ) %MSYS2_ROOT%\usr\bin\bash -lc "MSYSTEM= python3 run_tests.py --backend=ninja" env: CHERE_INVOKING: yes diff --git a/ci/azure-steps.yml b/ci/azure-steps.yml index d0f6d09..9d143db 100644 --- a/ci/azure-steps.yml +++ b/ci/azure-steps.yml @@ -5,8 +5,8 @@ steps: exit 0 } - # remove MinGW from path, so we don't find gfortran and try to use it - $env:Path = ($env:Path.Split(';') | Where-Object { $_ -notlike '*mingw*' }) -join ';' + # remove Chocolately, MinGW, Strawberry Perl from path, so we don't find gcc/gfortran and try to use it + $env:Path = ($env:Path.Split(';') | Where-Object { $_ -notmatch 'mingw|Strawberry|Chocolatey' }) -join ';' # download and install prerequisites function DownloadFile([String] $Source, [String] $Destination) { |