fix(ci): Disable gcc and install libc++ packages

This commit is contained in:
Michael Carlberg 2016-10-25 13:02:49 +02:00
parent 6a710b03e4
commit a2af30a494

View File

@ -4,7 +4,7 @@ language: cpp
compiler: compiler:
- clang - clang
- gcc # - gcc
addons: addons:
apt: apt:
@ -12,8 +12,8 @@ addons:
- ubuntu-toolchain-r-test - ubuntu-toolchain-r-test
- llvm-toolchain-precise-3.8 - llvm-toolchain-precise-3.8
packages: packages:
- gcc-5 # - gcc-5
- g++-5 # - g++-5
- clang-3.8 - clang-3.8
env: env:
@ -36,7 +36,7 @@ before_install:
# Install packages : core # Install packages : core
#--------------------------------------------------------------------------x #--------------------------------------------------------------------------x
- sudo apt-get install -y cmake cmake-data libcppunit-dev libboost-dev libfreetype6-dev - sudo apt-get install -y libc++-dev libc++abi-dev cmake cmake-data libcppunit-dev libboost-dev libfreetype6-dev
# Install packages : xcb # Install packages : xcb
#--------------------------------------------------------------------------x #--------------------------------------------------------------------------x
@ -94,7 +94,7 @@ install:
# Set compiler's # Set compiler's
#--------------------------------------------------------------------------x #--------------------------------------------------------------------------x
- if [[ "${CXX}" == "clang++" ]]; then export CXX="clang++-3.8" CC="clang-3.8" CXXFLAGS="${CXXFLAGS} -Qunused-arguments"; fi - if [[ "${CXX}" == "clang++" ]]; then export CXX="clang++-3.8" CC="clang-3.8" CXXFLAGS="${CXXFLAGS} -Qunused-arguments"; fi
- if [[ "${CXX}" == "g++" ]]; then export CXX="g++-5" CC="gcc-5"; fi # - if [[ "${CXX}" == "g++" ]]; then export CXX="g++-5" CC="gcc-5"; fi
before_script: before_script:
- eval "${CXX} --version" - eval "${CXX} --version"