Merge pull request #30122 from tchaikov/wip-40646

install-deps: revert 47d4351d

Reviewed-by: Neha Ojha <nojha@redhat.com>
Reviewed-by: Brad Hubbard <bhubbard@redhat.com>
This commit is contained in:
Kefu Chai 2019-09-04 11:36:20 +08:00 committed by GitHub
commit 722dd0eb91
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -224,11 +224,6 @@ EOF
source /opt/rh/devtoolset-$dts_ver/enable
fi
fi
if [ $(rpm -q --queryformat "%{VERSION}" devtoolset-$dts_ver-gcc-c++) = 8.3.1 ]; then
# rollback to avoid using a buggy version
$SUDO yum remove -y devtoolset-8-gcc-c++ devtoolset-8-gcc devtoolset-8-libstdc++-devel
$SUDO yum install -y devtoolset-8-gcc-c++-8.2.1-3.el7
fi
}
for_make_check=false