From fa0b9d8df103011e72e8e366b94419c75cb8dcb5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20M=C3=A4kel=C3=A4?= Date: Fri, 13 Nov 2020 15:55:47 +0200 Subject: [PATCH] Install one ASAN, not both Installing both seems to cause problems on CentOS 7. --- BUILD/install_build_deps.sh | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/BUILD/install_build_deps.sh b/BUILD/install_build_deps.sh index a6efc530f..9e6ae2561 100755 --- a/BUILD/install_build_deps.sh +++ b/BUILD/install_build_deps.sh @@ -127,12 +127,18 @@ then sudo yum -y install centos-release-scl || \ sudo yum-config-manager --enable rhui-REGION-rhel-server-rhscl - sudo yum -y install devtoolset-7-gcc-c++ - sudo yum -y install devtoolset-7-libasan-devel - - - # Enable it by default - echo "source /opt/rh/devtoolset-7/enable" >> ~/.bashrc + # Install newer compiler for CentOS 7 and 6 + grep "release [67]" /etc/redhat-release + if [ $? -eq 0 ] + then + sudo yum -y install devtoolset-7-gcc-c++ + sudo yum -y install devtoolset-7-libasan-devel + # Enable it by default + echo "source /opt/rh/devtoolset-7/enable" >> ~/.bashrc + else + # CentOS 8 only needs ASAN + sudo yum -y install libasan-devel + fi grep "release 6" /etc/redhat-release if [ $? -ne 0 ]