diff options
| author | Henning Baldersheim <balder@yahoo-inc.com> | 2019-05-23 12:03:26 +0000 |
|---|---|---|
| committer | Henning Baldersheim <balder@yahoo-inc.com> | 2019-05-23 12:03:26 +0000 |
| commit | af0d0d98e024c576f9088b3a30914448210b4301 (patch) | |
| tree | 5b9d1ada2219c60a07a2f1b4e49c77de4ebd55fa /vagrant | |
| parent | fd8802494eea58bdef444de9e3a3f70c3b2277cd (diff) | |
Devtoolset 8
Diffstat (limited to 'vagrant')
| -rw-r--r-- | vagrant/README.md | 4 | ||||
| -rw-r--r-- | vagrant/Vagrantfile | 4 |
2 files changed, 4 insertions, 4 deletions
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 |