j3d1/json
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Revert "👷 using libc++ with Clang"

Browse source 
This reverts commit 41b2c69bdb.
This commit is contained in:
Niels Lohmann 2017-08-23 08:39:19 +02:00
parent 0b5e8f859b
commit e45eaf6e30
No known key found for this signature in database
GPG key ID: 7F3CEA63AE251B69
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
.travis.yml
View file

@ -51,7 +51,7 @@ matrix:
addons: addons:
apt: apt:
sources: ['ubuntu-toolchain-r-test', 'llvm-toolchain-trusty-5.0'] sources: ['ubuntu-toolchain-r-test', 'llvm-toolchain-trusty-5.0']
packages: ['clang-5.0', 'libc++-dev', 'libc++abi-dev'] packages: ['g++-6', 'clang-5.0']
after_success: after_success:
- make clang_sanitize -j4 - make clang_sanitize -j4
@ -119,7 +119,7 @@ matrix:
addons: addons:
apt: apt:
sources: ['ubuntu-toolchain-r-test', 'llvm-toolchain-precise-3.6'] sources: ['ubuntu-toolchain-r-test', 'llvm-toolchain-precise-3.6']
packages: ['clang-3.6', 'libc++-dev', 'libc++abi-dev'] packages: ['g++-6', 'clang-3.6']
coverity_scan: coverity_scan:
project: project:
name: "nlohmann/json" name: "nlohmann/json"
@ -207,7 +207,7 @@ matrix:
addons: addons:
apt: apt:
sources: ['ubuntu-toolchain-r-test', 'llvm-toolchain-precise-3.5'] sources: ['ubuntu-toolchain-r-test', 'llvm-toolchain-precise-3.5']
packages: ['clang-3.5', 'libc++-dev', 'libc++abi-dev'] packages: ['g++-6', 'clang-3.5']
- os: linux - os: linux
compiler: clang compiler: clang
@ -215,7 +215,7 @@ matrix:
addons: addons:
apt: apt:
sources: ['ubuntu-toolchain-r-test', 'llvm-toolchain-precise-3.6'] sources: ['ubuntu-toolchain-r-test', 'llvm-toolchain-precise-3.6']
packages: ['clang-3.6', 'libc++-dev', 'libc++abi-dev'] packages: ['g++-6', 'clang-3.6']
- os: linux - os: linux
compiler: clang compiler: clang
@ -223,7 +223,7 @@ matrix:
addons: addons:
apt: apt:
sources: ['ubuntu-toolchain-r-test', 'llvm-toolchain-precise-3.7'] sources: ['ubuntu-toolchain-r-test', 'llvm-toolchain-precise-3.7']
packages: ['clang-3.7', 'libc++-dev', 'libc++abi-dev'] packages: ['g++-6', 'clang-3.7']
- os: linux - os: linux
compiler: clang compiler: clang
@ -231,7 +231,7 @@ matrix:
addons: addons:
apt: apt:
sources: ['ubuntu-toolchain-r-test'] sources: ['ubuntu-toolchain-r-test']
packages: ['clang-3.8', 'libc++-dev', 'libc++abi-dev'] packages: ['g++-6', 'clang-3.8']
- os: linux - os: linux
compiler: clang compiler: clang
@ -239,7 +239,7 @@ matrix:
addons: addons:
apt: apt:
sources: ['ubuntu-toolchain-r-test'] sources: ['ubuntu-toolchain-r-test']
packages: ['clang-3.9', 'libc++-dev', 'libc++abi-dev'] packages: ['g++-6', 'clang-3.9']
- os: linux - os: linux
compiler: clang compiler: clang
@ -247,7 +247,7 @@ matrix:
addons: addons:
apt: apt:
sources: ['ubuntu-toolchain-r-test', 'llvm-toolchain-trusty-4.0'] sources: ['ubuntu-toolchain-r-test', 'llvm-toolchain-trusty-4.0']
packages: ['clang-4.0', 'libc++-dev', 'libc++abi-dev'] packages: ['g++-6', 'clang-4.0']
- os: linux - os: linux
compiler: clang compiler: clang
@ -255,7 +255,7 @@ matrix:
addons: addons:
apt: apt:
sources: ['ubuntu-toolchain-r-test', 'llvm-toolchain-trusty-5.0'] sources: ['ubuntu-toolchain-r-test', 'llvm-toolchain-trusty-5.0']
packages: ['clang-5.0', 'libc++-dev', 'libc++abi-dev'] packages: ['g++-6', 'clang-5.0']
- os: linux - os: linux
compiler: clang compiler: clang
@ -265,7 +265,7 @@ matrix:
addons: addons:
apt: apt:
sources: ['ubuntu-toolchain-r-test', 'llvm-toolchain-trusty-5.0'] sources: ['ubuntu-toolchain-r-test', 'llvm-toolchain-trusty-5.0']
packages: ['clang-5.0', 'libc++-dev', 'libc++abi-dev'] packages: ['g++-6', 'clang-5.0']
################ ################
# build script # # build script #