Use version-specific libc++ packages

This commit is contained in:
Simon Brand
2019-10-25 10:42:27 +01:00
parent c325c63b17
commit 83bbfe108c

View File

@ -89,28 +89,28 @@ matrix:
- <<: *xenial-clang
sourceline: 'deb https://apt.llvm.org/xenial/ llvm-toolchain-xenial-5.0 main'
- ubuntu-toolchain-r-test
packages: [clang++-5.0, libc++-dev]
packages: [clang++-5.0, libc++-5-dev]
env: COMPILER=clang++-5.0 CXXSTD=11
- &clang-6
compiler: clang
addons:
apt:
sources: [llvm-toolchain-xenial-6.0, ubuntu-toolchain-r-test]
packages: [clang++-6.0, libc++-dev]
packages: [clang++-6.0, libc++-6-dev]
env: COMPILER=clang++-6.0 CXXSTD=11
- &clang-7
compiler: clang
addons:
apt:
sources: [llvm-toolchain-xenial-7, ubuntu-toolchain-r-test]
packages: [clang++-7, libc++-dev]
packages: [clang++-7, libc++-7-dev]
env: COMPILER=clang++-7 CXXSTD=11
- &clang-8
compiler: clang
addons:
apt:
sources: [llvm-toolchain-xenial-8, ubuntu-toolchain-r-test]
packages: [clang++-8, libc++-dev]
packages: [clang++-8, libc++-8-dev]
env: COMPILER=clang++-8 CXXSTD=11
- &clang-9
compiler: clang
@ -120,7 +120,7 @@ matrix:
- <<: *xenial-clang
sourceline: 'deb https://apt.llvm.org/xenial/ llvm-toolchain-xenial-9 main'
- ubuntu-toolchain-r-test
packages: [clang++-9, libc++-dev]
packages: [clang++-9, libc++-9-dev]
env: COMPILER=clang++-9 CXXSTD=11
- { <<: *gcc-5, env: COMPILER=g++-5 CXXSTD=14 }
- { <<: *gcc-6, env: COMPILER=g++-6 CXXSTD=14 }