diff options
| author | Jon Turney <jon.turney@dronecode.org.uk> | 2019-03-17 15:20:56 +0000 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2019-03-17 20:46:22 +0200 |
| commit | eb76ba7031f053a3c1e69ce79f52bf84a222fa48 (patch) | |
| tree | f5c1de3f7548a7828e7a8bbbabcd5d8520c5d1d6 | |
| parent | 7c461582a22cdc5792f2196c067eba18c5c9cd35 (diff) | |
| download | meson-eb76ba7031f053a3c1e69ce79f52bf84a222fa48.tar.gz | |
azure: Unset BOOST_ROOT for Cygwin, MSYS2 and clang-cl
It looks like BOOST_ROOT is now set in the azure v2017 image (relevant
change seems to be [1], pre-installing boost)
Remove BOOST_ROOT from the environment to prevent attempting to use a
boost which is incompatible with the compiler.
(an MSVC boost should be compatible with clang-cl, but has problems, see
c7a3e810)
[1] https://github.com/Microsoft/azure-pipelines-image-generation/pull/732
| -rw-r--r-- | azure-pipelines.yml | 2 | ||||
| -rw-r--r-- | ci/azure-steps.yml | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 5a7c6acdc..483f1eb2b 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -86,6 +86,7 @@ jobs: zlib-devel displayName: Install Dependencies - script: | + set BOOST_ROOT= set PATH=%CYGWIN_ROOT%\bin;%SYSTEMROOT%\system32 cp /usr/bin/python3.5 /usr/bin/python3 env.exe -- python3 run_tests.py --backend=ninja @@ -150,6 +151,7 @@ jobs: %TOOLCHAIN% displayName: Install Dependencies - script: | + set BOOST_ROOT= set PATH=%SystemRoot%\system32;%SystemRoot%;%SystemRoot%\System32\Wbem set PATHEXT=%PATHEXT%;.py if %compiler%==clang ( set CC=clang && set CXX=clang++ ) diff --git a/ci/azure-steps.yml b/ci/azure-steps.yml index 6fe1831e0..7e0f6fe3c 100644 --- a/ci/azure-steps.yml +++ b/ci/azure-steps.yml @@ -71,6 +71,8 @@ steps: Start-Process "boost_$boost_filename-msvc-$boost_abi_tag-$boost_bitness.exe" -ArgumentList "/dir=$(System.WorkFolder)\boost_$boost_filename /silent" -Wait $env:BOOST_ROOT = "$(System.WorkFolder)\boost_$boost_filename" $env:Path = "$env:Path;$env:BOOST_ROOT\lib$boost_bitness-msvc-$boost_abi_tag" + } else { + $env:BOOST_ROOT = "" } # install D compiler and dub packages |