From df0be82dd6581d02d2e5a6d706a26113b35b98d5 Mon Sep 17 00:00:00 2001 From: Jon Turney Date: Thu, 11 Apr 2019 18:12:11 +0100 Subject: 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. --- azure-pipelines.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'azure-pipelines.yml') 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 -- cgit v1.1