try simple fix for pipelines gcc-8 issue

This commit is contained in:
nhmall
2021-05-10 14:25:53 -04:00
parent 1e1d580336
commit 751cce7161

View File

@@ -1,16 +1,16 @@
strategy: strategy:
matrix: matrix:
linux_focal_gcc8_minimal: linux_focal_gcc9_minimal:
imageName: 'ubuntu-20.04' imageName: 'ubuntu-20.04'
toolchainName: gcc8 toolchainName: gcc9
buildTargetName: minimal buildTargetName: minimal
linux_focal_clang_all: linux_focal_clang_all:
imageName: 'ubuntu-20.04' imageName: 'ubuntu-20.04'
toolchainName: clang toolchainName: clang
buildTargetName: all buildTargetName: all
linux_focal_gcc8_all: linux_focal_gcc9_all:
imageName: 'ubuntu-20.04' imageName: 'ubuntu-20.04'
toolchainName: gcc8 toolchainName: gcc9
buildTargetName: all buildTargetName: all
linux_focal_gcc9_all: linux_focal_gcc9_all:
imageName: 'ubuntu-20.04' imageName: 'ubuntu-20.04'
@@ -66,11 +66,11 @@ steps:
echo "##vso[task.setvariable variable=CC]gcc-7" echo "##vso[task.setvariable variable=CC]gcc-7"
echo "##vso[task.setvariable variable=CXX]g++-7" echo "##vso[task.setvariable variable=CXX]g++-7"
fi fi
if [ "$(toolchain)" == "gcc8" ] # if [ "$(toolchain)" == "gcc8" ]
then # then
echo "##vso[task.setvariable variable=CC]gcc-8" # echo "##vso[task.setvariable variable=CC]gcc-8"
echo "##vso[task.setvariable variable=CXX]g++-8" # echo "##vso[task.setvariable variable=CXX]g++-8"
fi # fi
if [ "$(toolchain)" == "gcc9" ] if [ "$(toolchain)" == "gcc9" ]
then then
echo "##vso[task.setvariable variable=CC]gcc-9" echo "##vso[task.setvariable variable=CC]gcc-9"
@@ -88,8 +88,8 @@ steps:
fi fi
if [ "$(toolchain)" == "cross" ] if [ "$(toolchain)" == "cross" ]
then then
echo "##vso[task.setvariable variable=CC]gcc-8" echo "##vso[task.setvariable variable=CC]gcc-9"
echo "##vso[task.setvariable variable=CXX]g++-8" echo "##vso[task.setvariable variable=CXX]g++-9"
fi fi
displayName: 'Setting variables' displayName: 'Setting variables'