Devtoolset 8

5 files changed, 10 insertions, 10 deletions

diff --git a/bootstrap-cpp.sh b/bootstrap-cpp.sh
index bc4c6466596..5fe4723ea90 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-7/enable || true
+source /opt/rh/devtoolset-8/enable || true
 cd "${SOURCE_DIR}"
 bash ./bootstrap.sh full
 cd "${BUILD_DIR}"
diff --git a/dist/vespa.spec b/dist/vespa.spec
index 79c1e170083..f7360419ce6 100644
--- a/dist/vespa.spec
+++ b/dist/vespa.spec
@@ -19,11 +19,11 @@ Source0:        vespa-%{version}.tar.gz
 %if 0%{?centos}
 BuildRequires: epel-release
 BuildRequires: centos-release-scl
-BuildRequires: devtoolset-7-gcc-c++
-BuildRequires: devtoolset-7-libatomic-devel
-BuildRequires: devtoolset-7-binutils
+BuildRequires: devtoolset-8-gcc-c++
+BuildRequires: devtoolset-8-libatomic-devel
+BuildRequires: devtoolset-8-binutils
 BuildRequires: rh-maven35
-%define _devtoolset_enable /opt/rh/devtoolset-7/enable
+%define _devtoolset_enable /opt/rh/devtoolset-8/enable
 %define _rhmaven35_enable /opt/rh/rh-maven35/enable
 %endif
 %if 0%{?fedora}
diff --git a/travis/travis-build-full.sh b/travis/travis-build-full.sh
index ce365214434..1715c9e2288 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-7.sh
+source /etc/profile.d/enable-devtoolset-8.sh
 source /etc/profile.d/enable-rh-maven35.sh
 
 ccache --max-size=1250M
diff --git a/vagrant/README.md b/vagrant/README.md
index 8a4ebdc8d60..71fa071cb46 100644
--- a/vagrant/README.md
+++ b/vagrant/README.md
@@ -83,8 +83,8 @@ When prompted, configure toolchains as follows:
 
     CMake: /usr/bin/cmake3
     Make: /usr/bin/make
-    C Compiler: /opt/rh/devtoolset-7/root/usr/bin/cc
-    C++ Compiler: /opt/rh/devtoolset-7/root/usr/bin/c++
+    C Compiler: /opt/rh/devtoolset-8/root/usr/bin/cc
+    C++ Compiler: /opt/rh/devtoolset-8/root/usr/bin/c++
 
 #### 3. Open the Vespa Project
 Go to *File* -> *Open* and choose <vespa-source>>/CMakeLists.txt.
diff --git a/vagrant/Vagrantfile b/vagrant/Vagrantfile
index 996636aeb01..be0824dbd55 100644
--- a/vagrant/Vagrantfile
+++ b/vagrant/Vagrantfile
@@ -79,14 +79,14 @@ Vagrant.configure("2") do |config|
 
   # Add settings for Vespa and dev tools as the default user, usually 'vagrant' (privileged: false)
   # NOTE: adding these settings to .bashrc would break vagrant suspend/resume/provision
-  #       due to env vars modified by /opt/rh/devtoolset-7/enable.
+  #       due to env vars modified by /opt/rh/devtoolset-8/enable.
   config.vm.provision "shell", privileged: false, inline: <<-SCRIPT
     grep -l VESPA_HOME ~/.bash_profile >/dev/null || (\
       printf "%s\n" \
         'export VESPA_HOME=$HOME/vespa' \
         'export PATH=$PATH:$VESPA_HOME/bin' \
         'source /opt/rh/rh-maven35/enable' \
-        'source /opt/rh/devtoolset-7/enable' \
+        'source /opt/rh/devtoolset-8/enable' \
         >> ~/.bash_profile )
   SCRIPT