Merge pull request #12969 from vespa-engine/balder/gcc-9

Use gcc 9

3 files changed, 6 insertions, 6 deletions

diff --git a/bootstrap-cpp.sh b/bootstrap-cpp.sh
index 5fe4723ea90..5753d4cfcfd 100755
--- a/bootstrap-cpp.sh
+++ b/bootstrap-cpp.sh
@@ -48,7 +48,7 @@ mkdir -p "${BUILD_DIR}" || {
 BUILD_DIR=$(realpath "${BUILD_DIR}")
 
 # Build it
-source /opt/rh/devtoolset-8/enable || true
+source /opt/rh/devtoolset-9/enable || true
 cd "${SOURCE_DIR}"
 bash ./bootstrap.sh full
 cd "${BUILD_DIR}"
diff --git a/dist/vespa.spec b/dist/vespa.spec
index 9949e4909ee..b2f3d1d5df4 100644
--- a/dist/vespa.spec
+++ b/dist/vespa.spec
@@ -30,11 +30,11 @@ BuildRequires: centos-release-scl
 %endif
 %endif
 %if 0%{?el7}
-BuildRequires: devtoolset-8-gcc-c++
-BuildRequires: devtoolset-8-libatomic-devel
-BuildRequires: devtoolset-8-binutils
+BuildRequires: devtoolset-9-gcc-c++
+BuildRequires: devtoolset-9-libatomic-devel
+BuildRequires: devtoolset-9-binutils
 BuildRequires: rh-maven35
-%define _devtoolset_enable /opt/rh/devtoolset-8/enable
+%define _devtoolset_enable /opt/rh/devtoolset-9/enable
 %define _rhmaven35_enable /opt/rh/rh-maven35/enable
 %endif
 %if 0%{?el8}
diff --git a/travis/travis-build-full.sh b/travis/travis-build-full.sh
index 62821e0e06d..f44e5e55d7a 100755
--- a/travis/travis-build-full.sh
+++ b/travis/travis-build-full.sh
@@ -6,7 +6,7 @@ export SOURCE_DIR=/source
 export NUM_THREADS=6
 export MALLOC_ARENA_MAX=1
 export MAVEN_OPTS="-Xss1m -Xms128m -Xmx2g"
-source /etc/profile.d/enable-devtoolset-8.sh
+source /etc/profile.d/enable-devtoolset-9.sh
 source /etc/profile.d/enable-rh-maven35.sh
 
 ccache --max-size=1250M