From 9a01538f6933774c3dc6816482324b61efa9cdaf Mon Sep 17 00:00:00 2001 From: Arnaud Giersch Date: Mon, 7 Mar 2022 17:31:00 +0100 Subject: [PATCH 1/1] [jenkins] Avoid build errors on centos. --- tools/jenkins/build.sh | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/tools/jenkins/build.sh b/tools/jenkins/build.sh index cfeaa089a2..8abe068c62 100755 --- a/tools/jenkins/build.sh +++ b/tools/jenkins/build.sh @@ -197,11 +197,17 @@ else MAY_DISABLE_SOURCE_CHANGE="-DCMAKE_DISABLE_SOURCE_CHANGES=ON" fi -if [ "$os" = "CentOS" ] && [ "$(ld -v | cut -d\ -f4 | cut -c1-4)" = "2.30" ]; then - echo "Temporary disable LTO, believed to be broken on this system." - MAY_DISABLE_LTO=-Denable_lto=OFF -else - MAY_DISABLE_LTO= +if [ "$os" = "CentOS" ]; then + if [ "$(ld -v | cut -d\ -f4 | cut -c1-4)" = "2.30" ]; then + echo "Temporary disable LTO, believed to be broken on this system." + MAY_DISABLE_LTO=-Denable_lto=OFF + else + MAY_DISABLE_LTO= + fi + if [ "$(rpm -q eigen3-devel --qf '%{VERSION}')" = "3.3.4" ]; then + echo "Temporary avoid build error seen with eigen3 version 3.3.4" + export CXXFLAGS=-Wno-error=int-in-bool-context + fi fi cmake -G"$GENERATOR" ${INSTALL:+-DCMAKE_INSTALL_PREFIX=$INSTALL} \ -- 2.20.1