vim/YouCompleteMe
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use g++ 4.8 on YouCompleteMe builds too as the new boost requires this

Browse Source
This commit is contained in:
Ben Jackson 2016-10-02 19:24:45 +01:00
parent 94a81144af
commit 1e8be57708
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.travis.yml
View File

@ -11,6 +11,9 @@ install:
script: script:
- ci/travis/travis_script.sh - ci/travis/travis_script.sh
env: env:
global:
# Travis can run out of RAM, so we need to be careful here.
- YCM_CORES=3
matrix: matrix:
- YCM_PYTHON_VERSION=2.7 YCM_FLAKE8=true - YCM_PYTHON_VERSION=2.7 YCM_FLAKE8=true
# Since 3.0.4, Flake8 is not working anymore on Python 2.6. # Since 3.0.4, Flake8 is not working anymore on Python 2.6.
@ -30,6 +33,7 @@ addons:
packages: packages:
- cmake-data - cmake-data
- cmake - cmake
- g++-4.8
- ninja-build - ninja-build
# Everything below is a Python build dep (though it depends on Python # Everything below is a Python build dep (though it depends on Python
# version). We need them because pyenv builds Python. # version). We need them because pyenv builds Python.

10
ci/travis/travis_install.linux.sh
View File

@ -1,5 +1,15 @@
# Linux-specific installation # Linux-specific installation
# We can't use sudo, so we have to approximate the behaviour of setting the
# default system compiler.
mkdir ${HOME}/bin
ln -s /usr/bin/g++-4.8 ${HOME}/bin/c++
ln -s /usr/bin/gcc-4.8 ${HOME}/bin/cc
export PATH=${HOME}/bin:${PATH}
# In order to work with ycmd, python *must* be built as a shared library. This # In order to work with ycmd, python *must* be built as a shared library. This
# is set via the PYTHON_CONFIGURE_OPTS option. # is set via the PYTHON_CONFIGURE_OPTS option.
export PYTHON_CONFIGURE_OPTS="--enable-shared" export PYTHON_CONFIGURE_OPTS="--enable-shared"