diff options
| author | Jon Bratseth <bratseth@yahoo-inc.com> | 2018-01-19 14:09:27 +0100 |
|---|---|---|
| committer | Jon Bratseth <bratseth@yahoo-inc.com> | 2018-01-19 14:09:27 +0100 |
| commit | 63f899363c6410b94406a257697278b41b112f4b (patch) | |
| tree | f05d21e0403b0921e98687249610a226bf291d93 /vagrant | |
| parent | cb3751dee3016ff0dc57e22f52207dd6adee0b48 (diff) | |
Tweakify
Diffstat (limited to 'vagrant')
| -rw-r--r-- | vagrant/README.md | 16 | ||||
| -rw-r--r-- | vagrant/Vagrantfile | 2 |
2 files changed, 11 insertions, 7 deletions
diff --git a/vagrant/README.md b/vagrant/README.md index a0f6028f072..d81e80e8808 100644 --- a/vagrant/README.md +++ b/vagrant/README.md @@ -31,7 +31,6 @@ This is needed in order to compile and run tests fast on the local file system i git clone git@github.com:vespa-engine/vespa.git - ## Build C++ modules Please follow the build instructions described [here](../README.md#build-c-modules). Skip these steps if doing development with CLion. @@ -51,6 +50,11 @@ Open a terminal inside the virtual CentOS desktop (password is "vagrant") and ru clion +When promoted, configure c and cpp compilers to + + /opt/rh/devtoolset-7/root/usr/bin/cc + /opt/rh/devtoolset-7/root/usr/bin/c++ + #### 3. Open the Vespa Project Go to *File* -> *Open* and choose <vespa-source>>/CMakeLists.txt. @@ -58,10 +62,12 @@ Go to *File* -> *Open* and choose <vespa-source>>/CMakeLists.txt. Go to *File* -> *Settings* -> *Build, Execution, Deployment* -> *CMake*. Under *Build Options* specify "-j 4" and click *Apply*. +#### 5. Run bootstrap again + + ./bootstrap-cpp.sh . . + +(Some of the changes made by it are undone by clion on the first startup.) + #### 5. Build all modules Choose target **all_modules** from the set of build targets at the top right and click build. -#### Troubleshooting - -If there are build errors try to run bootstrap-cpp.sh again -(some of what it does may be undone by clion setup).
\ No newline at end of file diff --git a/vagrant/Vagrantfile b/vagrant/Vagrantfile index 0c886c31f45..de7867cd4f7 100644 --- a/vagrant/Vagrantfile +++ b/vagrant/Vagrantfile @@ -26,8 +26,6 @@ Vagrant.configure("2") do |config| yum -y install epel-release yum -y install centos-release-scl yum -y install yum-utils - yum -y install boost-devel - yum -y install cppunit yum -y install git \ ccache \ maven \ |