remove osx, fix clang source/package

This commit is contained in:
Jarryd Beck 2016-08-26 18:36:24 +10:00
parent 5d29ed878a
commit b091ec31a1

View File

@ -1,8 +1,6 @@
sudo: required sudo: required
dist: trusty dist: trusty
language: cpp language: cpp
os:
- osx
matrix: matrix:
include: include:
- os: linux - os: linux
@ -14,16 +12,14 @@ matrix:
sources: &sources sources: &sources
- llvm-toolchain-precise-3.8 - llvm-toolchain-precise-3.8
- ubuntu-toolchain-r-test - ubuntu-toolchain-r-test
- libc++-dev
- os: linux - os: linux
env: COMPILER=clang++-3.8 CXXFLAGS=-stdlib=libc++ env: COMPILER=clang++-3.8 CXXFLAGS=-stdlib=libc++
addons: addons:
apt: apt:
packages: packages:
- clang-3.8 - clang-3.8
- libc++-dev
sources: *sources sources: *sources
- os: osx
env: CXXFLAGS=-stdlib=libc++
script: > script: >
cmake -DCXXOPTS_BUILD_TESTS=ON -DCMAKE_CXX_COMPILER=$COMPILER cmake -DCXXOPTS_BUILD_TESTS=ON -DCMAKE_CXX_COMPILER=$COMPILER
-DCMAKE_CXX_FLAGS=$CXXFLAGS . -DCMAKE_CXX_FLAGS=$CXXFLAGS .