]> git.apps.os.sepia.ceph.com Git - ceph.git/commitdiff
install-deps: revert 47d4351d 30122/head
authorKefu Chai <kchai@redhat.com>
Wed, 4 Sep 2019 01:15:18 +0000 (09:15 +0800)
committerKefu Chai <kchai@redhat.com>
Wed, 4 Sep 2019 01:17:13 +0000 (09:17 +0800)
this change reverts 47d4351d3ad2787ae7781d868608eb0e3c7797c7

see also 33dfffc8

Fixes: https://tracker.ceph.com/issues/40646
Signed-off-by: Kefu Chai <kchai@redhat.com>
install-deps.sh

index 5a0d336dfcd23e977f0cd03f1891c68a3d3e2902..23b6e2f97ab799a3455ec007b7bcffd82fd78f27 100755 (executable)
@@ -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