diff options
| author | Henning Baldersheim <balder@yahoo-inc.com> | 2020-04-17 13:59:01 +0000 |
|---|---|---|
| committer | Henning Baldersheim <balder@yahoo-inc.com> | 2020-04-17 13:59:01 +0000 |
| commit | fec626536906d306c03d34ba2418f17a801f7c5e (patch) | |
| tree | 89036bf8fcd9ccc5b4c48d057d77cb30ab8ac444 | |
| parent | 68ad59dcb3b6d6f38197302dfefcc78d0653a012 (diff) | |
Use gcc 9
| -rwxr-xr-x | bootstrap-cpp.sh | 2 | ||||
| -rw-r--r-- | dist/vespa.spec | 8 | ||||
| -rwxr-xr-x | travis/travis-build-full.sh | 2 | ||||
| -rw-r--r-- | vagrant/README.md | 4 | ||||
| -rw-r--r-- | vagrant/Vagrantfile | 4 |
5 files changed, 10 insertions, 10 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 diff --git a/vagrant/README.md b/vagrant/README.md index 71fa071cb46..41b1f274071 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-8/root/usr/bin/cc - C++ Compiler: /opt/rh/devtoolset-8/root/usr/bin/c++ + C Compiler: /opt/rh/devtoolset-9/root/usr/bin/cc + C++ Compiler: /opt/rh/devtoolset-9/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 be0824dbd55..0c44815036b 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-8/enable. + # due to env vars modified by /opt/rh/devtoolset-9/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-8/enable' \ + 'source /opt/rh/devtoolset-9/enable' \ >> ~/.bash_profile ) SCRIPT |