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 /azure-pipelines.yml | |
| parent | 10749494c81d78b74421e8ed238339b1d067a0b6 (diff) | |
| download | meson-df0be82dd6581d02d2e5a6d706a26113b35b98d5.tar.gz | |
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.
Diffstat (limited to 'azure-pipelines.yml')
| -rw-r--r-- | azure-pipelines.yml | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 483f1eb2b..d408762ab 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 |